Multi-layer Compositing #675

eschweic · 2013-08-05T20:28:21Z

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, compositor_layer.rs, does most of the heavy lifting that was once in mod.rs.

--- clipped so bors is happy ---


        Add resize functionality to quadtrees


        Allow rectangular tiles


        Add compositor_layer.rs


        Refactor compositor; implement compositor iframe support

pcwalton · 2013-08-05T20:48:51Z

difference == how many times you have to double or halve

pcwalton · 2013-08-05T20:50:18Z

Oh, I see, so you're recursively dividing in this branch and otherwise recursively halving in the other branch. Might want to leave a comment to this effect.

tikue · 2013-08-05T20:52:21Z

src/components/main/compositing/compositor_layer.rs

+    container: @mut ContainerLayer,
+}
+
+pub fn CompositorLayer(pipeline: Pipeline, page_size: Size2D<f32>, tile_size: uint,


I would move this function into impl CompositorLayer and name it new.

pcwalton · 2013-08-05T20:52:55Z

nit: I would say "potentially has a larger size, since it is rounded up to a power of two".

pcwalton · 2013-08-05T20:54:53Z

It would be good to allocate only as much space as is needed in video memory for tiles with portions outside the clip. Doesn't have to be done as part of this patch, but we should get this issue on file as I suspect there will be nasty memory usage edge conditions that could arise without it.

pcwalton · 2013-08-05T21:11:45Z

Please move this to a function called new inside the impl. This is the current Rust style.

pcwalton · 2013-08-05T21:12:03Z

Comment whether higher numbers mean "closer to the viewer" or "farther from the viewer".

pcwalton · 2013-08-05T21:12:28Z

What is the ID used for? Needs a comment.

pcwalton · 2013-08-05T21:13:01Z

By "redisplayed" you mean "rerendered", right?

pcwalton · 2013-08-05T21:15:37Z

Child layers, you mean?

pcwalton · 2013-08-05T21:16:18Z

To the scroll position of the page? I'm a little confused as to what this means. Is it relative to the top left of the page, do you mean?

pcwalton · 2013-08-05T21:17:55Z

Might be nice to factor these out to use the Tree trait (you don't have to do this as part of this patch)

pcwalton · 2013-08-05T21:20:29Z

Looks good modulo nits. Once those are fixed, r=me.


        auto merge of #675 : eschweic/servo/multi-layer, r=pcwalton

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, `compositor_layer.rs`, does most of the heavy lifting that was once in `mod.rs`. New features include: * Better scrolling. Scrolling is now applied on a per-layer basis. The layer under the cursor is scrolled first; if it cannot be scrolled (i.e. it is at a page boundary), the scroll is propagated to the layer's parents. * Better zooming. Most of the time, layers are not aware of the current zoom factor; this is handled by the compositor. Everything else is computed in page coordinates. * Better clicking. Clicks are propagated from child layers upwards, and take scroll offsets into account. This also fixes an issue where hit testing was off for retina displays. Still to do: * Connect with tikue's changes. * Figure out snap-to-pixel scrolling. This is a lot trickier than it was before. * iframes don't have backgrounds yet; they appear transparent until their tiles are rendered. Depends on: * servo/rust-opengles#47 * servo/rust-layers#23 * servo/euclid#11 Here's a preview: ![iframe-test](https://f.cloud.github.com/assets/4186321/912968/1c305e02-fe0c-11e2-876d-2333afd27af9.png) What looks like a compositor bug is actually a separate layer that I hard-coded in. So far it seems to be fully functional.


        auto merge of #675 : eschweic/servo/multi-layer, r=pcwalton

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, `compositor_layer.rs`, does most of the heavy lifting that was once in `mod.rs`. New features include: * Better scrolling. Scrolling is now applied on a per-layer basis. The layer under the cursor is scrolled first; if it cannot be scrolled (i.e. it is at a page boundary), the scroll is propagated to the layer's parents. * Better zooming. Most of the time, layers are not aware of the current zoom factor; this is handled by the compositor. Everything else is computed in page coordinates. * Better clicking. Clicks are propagated from child layers upwards, and take scroll offsets into account. This also fixes an issue where hit testing was off for retina displays. Still to do: * Connect with tikue's changes. * Figure out snap-to-pixel scrolling. This is a lot trickier than it was before. * iframes don't have backgrounds yet; they appear transparent until their tiles are rendered. Depends on: * servo/rust-opengles#47 * servo/rust-layers#23 * servo/euclid#11 Here's a preview: ![iframe-test](https://f.cloud.github.com/assets/4186321/912968/1c305e02-fe0c-11e2-876d-2333afd27af9.png) What looks like a compositor bug is actually a separate layer that I hard-coded in. So far it seems to be fully functional.


        auto merge of #675 : eschweic/servo/multi-layer, r=pcwalton

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, `compositor_layer.rs`, does most of the heavy lifting that was once in `mod.rs`. New features include: * Better scrolling. Scrolling is now applied on a per-layer basis. The layer under the cursor is scrolled first; if it cannot be scrolled (i.e. it is at a page boundary), the scroll is propagated to the layer's parents. * Better zooming. Most of the time, layers are not aware of the current zoom factor; this is handled by the compositor. Everything else is computed in page coordinates. * Better clicking. Clicks are propagated from child layers upwards, and take scroll offsets into account. This also fixes an issue where hit testing was off for retina displays. Still to do: * Connect with tikue's changes. * Figure out snap-to-pixel scrolling. This is a lot trickier than it was before. * iframes don't have backgrounds yet; they appear transparent until their tiles are rendered. Depends on: * servo/rust-opengles#47 * servo/rust-layers#23 * servo/euclid#11 Here's a preview: ![iframe-test](https://f.cloud.github.com/assets/4186321/912968/1c305e02-fe0c-11e2-876d-2333afd27af9.png) What looks like a compositor bug is actually a separate layer that I hard-coded in. So far it seems to be fully functional.


        auto merge of #675 : eschweic/servo/multi-layer, r=pcwalton

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, `compositor_layer.rs`, does most of the heavy lifting that was once in `mod.rs`. --- clipped so bors is happy ---


        Update submodule pointers; address nits; add optional page_size

eschweic · 2013-08-08T17:26:30Z

r=pcwalton

metajack · 2013-08-08T17:39:01Z

r+

bors-servo · 2013-08-08T17:40:10Z

saw approval from metajack
at eschweic@4b2d7f0

bors-servo · 2013-08-08T17:40:13Z

merging eschweic/servo/multi-layer = 4b2d7f0 into auto

bors-servo · 2013-08-08T17:40:14Z

eschweic/servo/multi-layer = 4b2d7f0 merged ok, testing candidate = 0d46164

bors-servo · 2013-08-08T18:00:43Z

all tests pass:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/220
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/175

bors-servo · 2013-08-08T18:03:40Z

fast-forwarding master to auto = 0d46164


        auto merge of #675 : eschweic/servo/multi-layer, r=metajack

This refactors the compositor and adds initial support for multiple compositor layers being displayed at once. A new module, `compositor_layer.rs`, does most of the heavy lifting that was once in `mod.rs`. --- clipped so bors is happy ---


        Merge pull request servo#675 from foolip/rm-redundant-audio

Remove redundant HTMLVideoElement.audio tests


        Auto merge of servo#675 - servo:ScrollPolicy-heapsize, r=emilio

Implement HeapSizeOf for ScrollPolicy.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/675)

eschweic added 4 commits Jul 18, 2013

Add resize functionality to quadtrees

b0b62e2

Allow rectangular tiles

95f089e

Add compositor_layer.rs

0e73774

Refactor compositor; implement compositor iframe support

974ed79

tikue reviewed Aug 5, 2013
View changes

metajack closed this Aug 7, 2013

metajack reopened this Aug 8, 2013

eschweic closed this Aug 8, 2013

eschweic reopened this Aug 8, 2013

eschweic closed this Aug 8, 2013

metajack reopened this Aug 8, 2013

Update submodule pointers; address nits; add optional page_size

Loading status checks…

4b2d7f0

bors-servo closed this Aug 8, 2013

ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014

Merge pull request servo#675 from foolip/rm-redundant-audio

27a6b10

Remove redundant HTMLVideoElement.audio tests

servo / servo

Join GitHub today

Multi-layer Compositing #675

Multi-layer Compositing #675

Conversation

eschweic commented Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/quadtree.rs in b0b62e2 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/quadtree.rs in b0b62e2 Aug 5, 2013

This comment has been minimized.

tikue Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/quadtree.rs in 95f089e Aug 5, 2013

This comment has been minimized.

pcwalton commented on 95f089e Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 0e73774 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 0e73774 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 0e73774 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 0e73774 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 974ed79 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 974ed79 Aug 5, 2013

This comment has been minimized.

pcwalton commented on src/components/main/compositing/compositor_layer.rs in 974ed79 Aug 5, 2013

pcwalton commented Aug 5, 2013

This comment has been minimized.

eschweic commented on 4b2d7f0 Aug 8, 2013

This comment has been minimized.

metajack replied Aug 8, 2013

This comment has been minimized.

bors-servo commented on 4b2d7f0 Aug 8, 2013

This comment has been minimized.

bors-servo replied Aug 8, 2013

This comment has been minimized.

bors-servo replied Aug 8, 2013

This comment has been minimized.

bors-servo replied Aug 8, 2013

This comment has been minimized.

bors-servo replied Aug 8, 2013

pcwalton commented on `src/components/main/compositing/quadtree.rs` in `b0b62e2` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/quadtree.rs` in `b0b62e2` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/quadtree.rs` in `95f089e` Aug 5, 2013

pcwalton commented on `95f089e` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `0e73774` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `0e73774` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `0e73774` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `0e73774` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `974ed79` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `974ed79` Aug 5, 2013

pcwalton commented on `src/components/main/compositing/compositor_layer.rs` in `974ed79` Aug 5, 2013

eschweic commented on `4b2d7f0` Aug 8, 2013

bors-servo commented on `4b2d7f0` Aug 8, 2013