diff options
| author | trchen@chromium.org <trchen@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2013-05-21 01:53:49 +0000 |
|---|---|---|
| committer | trchen@chromium.org <trchen@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2013-05-21 01:53:49 +0000 |
| commit | 302ffc50c2b69ed8741cf1431b66458b29caa556 (patch) | |
| tree | e8aef4abc700ce0911130a1f0e111df4914acac5 | |
| parent | b9ab3df0665a4a07b4004832ce870c583df27f49 (diff) | |
| download | chromium_src-302ffc50c2b69ed8741cf1431b66458b29caa556.zip chromium_src-302ffc50c2b69ed8741cf1431b66458b29caa556.tar.gz chromium_src-302ffc50c2b69ed8741cf1431b66458b29caa556.tar.bz2 | |
Remove NonCompositedContentHost
Safari uses a hybrid scrolling approach. For contents that require
compositing, they will create compositing layers and will use layer-based
scrolling. For non-composited contents, they will be painted to a native
window and will be scrolled with a OS-provided backing.
Chromium doesn't use this native window based scrolling. Instead,
NonCompositedContentHost was introduced to provide a replacement for
the OS-provided backing.
Now we no longer need to maintain compatibility with the native window
approach. This patch removes RenderLayerBacking::paintsIntoWindow().
Main frame contents will be painted onto its RenderView layer (which was
always created but only used as container for child layer), and
NonCompositedContentHost becomes redundant which gets removed too.
R=jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13959008
git-svn-id: svn://svn.chromium.org/blink/trunk@150733 bbb929c8-8fbe-4397-9dbb-9b2b20218538
267 files changed, 357 insertions, 449 deletions
diff --git a/third_party/WebKit/LayoutTests/NeverFixTests b/third_party/WebKit/LayoutTests/NeverFixTests index 6805eb9..83c5a6b 100644 --- a/third_party/WebKit/LayoutTests/NeverFixTests +++ b/third_party/WebKit/LayoutTests/NeverFixTests @@ -38,6 +38,7 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ImageOnlyFailure ] # that is not supported on other platforms. [ Win Linux ] rubberbanding [ WontFix ] [ Win Linux ] compositing/rubberbanding [ WontFix ] +[ Win Linux ] virtual/softwarecompositing/rubberbanding [ WontFix ] # This requires usp10.dll version 1.600 or greater on Windows and # it isn't installed on XP by default. diff --git a/third_party/WebKit/LayoutTests/compositing/absolute-inside-out-of-view-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/absolute-inside-out-of-view-fixed-expected.txt index 4f736c9..17415cb 100644 --- a/third_party/WebKit/LayoutTests/compositing/absolute-inside-out-of-view-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/absolute-inside-out-of-view-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 2513.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 0.00 200.00) diff --git a/third_party/WebKit/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt index 37c01dc..d7ea9a6 100644 --- a/third_party/WebKit/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 100.00 100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/clip-child-by-non-stacking-ancestor-expected.txt b/third_party/WebKit/LayoutTests/compositing/clip-child-by-non-stacking-ancestor-expected.txt index d5e17cb..caeddd2 100644 --- a/third_party/WebKit/LayoutTests/compositing/clip-child-by-non-stacking-ancestor-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/clip-child-by-non-stacking-ancestor-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt b/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt index db1f96c..909506a 100644 --- a/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 1600.00 585.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 818.00 145.00) diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-clip-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-clip-expected.txt index 4817586..1fe0867 100644 --- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-clip-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-clip-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 13.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt index 37fb124..73cfa52 100644 --- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/filter-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/filter-expected.txt index 18c8d3d..5170ffa 100644 --- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/filter-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/filter-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt index 19e8f4d..1646cfb 100644 --- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt index dcf250e..1ebf3c0 100644 --- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt index d3d8fc5..440c67e 100644 --- a/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 80.00 80.00) diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt index bc3ef30..c4f1576 100644 --- a/third_party/WebKit/LayoutTests/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 205.00 205.00) diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt index 872b310..67a06a1 100644 --- a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 105.00 105.00) diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt index b506386..5b41f3a 100644 --- a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 105.00 105.00) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/force-composite-empty-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/force-composite-empty-expected.txt index fe15a4e..f34ecab 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/force-composite-empty-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/force-composite-empty-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) ) ) ) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt index adfb565..97b191d 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) ) ) ) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt index adfb565..97b191d 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) ) ) ) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt index 87c7c5a..8a2af67 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt index 87c7c5a..8a2af67 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-leave-compositing-expected.txt b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-leave-compositing-expected.txt index adfb565..97b191d 100644 --- a/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-leave-compositing-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/force-compositing-mode/overflow-iframe-leave-compositing-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) ) ) ) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt index a629a0b..177ff25 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 6.00 6.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-clipped-composited-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-clipped-composited-child-expected.txt index 1a75ebc..aff6b82 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-clipped-composited-child-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-clipped-composited-child-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 58.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt index b8046e6..d4b696e 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-expected.txt index c3b028b..29b3ac9 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 44990.00 15063.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt index 9c14a62..48d1eca 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt @@ -6,6 +6,7 @@ Test CSS clip with composited layers. Left and right sides should look the same. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 20.00 20.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt index 068b2d5..7de9778 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt @@ -6,6 +6,7 @@ Test CSS clip with composited layers. Left and right sides should look the same. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 25.00 35.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt index 1a9f3a5..7096159 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt @@ -7,6 +7,7 @@ After (should not be empty): (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 480.00 30.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt index a4baea4..34787dc 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/foreground-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/foreground-layer-expected.txt index 0368893..8e725de5b 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/foreground-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/foreground-layer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-switch-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-switch-expected.txt index bc98b8d..c404c17 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-switch-expected.txt @@ -10,6 +10,7 @@ Second dump layer tree: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt index a215b57..e82231a 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt @@ -10,6 +10,7 @@ middlebottom (GraphicsLayer (bounds 785.00 2618.00) (contentsOpaque 1) + (drawsContent 1) (children 6 (GraphicsLayer (position 21.00 21.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt index c263870..1c6c904 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 5013.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 100.00 3100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt index 4082b95..e981a4c 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt @@ -5,6 +5,7 @@ Text here (GraphicsLayer (bounds 785.00 1021.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 29.00 134.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt index ef994bb..087271d 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt @@ -6,6 +6,7 @@ Fader (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt index 0543cd5..2be683d 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt @@ -5,6 +5,7 @@ Text here (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 29.00 29.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt index 8746e3c..a0a7527 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt @@ -5,6 +5,7 @@ Text here (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 29.00 29.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt index d8fc930..e8891a8 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt @@ -5,6 +5,7 @@ Text here (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 129.00 29.00) diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt index 68d299d..0b3423e 100644 --- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt @@ -5,6 +5,7 @@ middle (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 129.00 29.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt index 5a29b93..449b5b1 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 785.00 1500.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 20.00 120.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt index 236ad7a..334adeb 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 58.00 58.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt index c622e03..1e313ae 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position -12.00 -12.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt index 2d7f103..82fefba 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt @@ -7,6 +7,7 @@ When the parent document becomes composited, the layer trees should get connecte (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 108.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt index 51c7bea..6342514 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt index bd0181c..032cf17 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt index b558cef..b7f10c5 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 28.00 28.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt index a74a047..f48e2f2 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt index 42dc9fb..b471e15 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 304.00 304.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt index bb89d23..f2bf871 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 785.00 1650.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 20.00 150.00) diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt index 2fdf33b..436739b 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/images/clip-on-directly-composited-image-expected.txt b/third_party/WebKit/LayoutTests/compositing/images/clip-on-directly-composited-image-expected.txt index a5bd0f8..cddb2df 100644 --- a/third_party/WebKit/LayoutTests/compositing/images/clip-on-directly-composited-image-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/images/clip-on-directly-composited-image-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 210.00 23.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt index 1924f23..414e635 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt @@ -6,6 +6,7 @@ Should be composited (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt index ff1fdc6..659078a 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 5021.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 100.00 1100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt index 173c44f..b8ee371 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt @@ -6,6 +6,7 @@ Layer tree when the fixed elements are in-view (both fixed elements should have (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 100.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt index e85080c..00d460b 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt @@ -6,6 +6,7 @@ Even though the fixed-position element's container is nonscrollable, it should s (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 10.00 100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt index e5c28a8..200b54c 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt @@ -6,6 +6,7 @@ Even though we can opt-out of fixed-position compositing for unscrollable fixed- (GraphicsLayer (bounds 800.00 4024.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt index 4a4c27e..010eeb6 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt @@ -5,6 +5,7 @@ In all iframes, the green fixed-position element should not be composited. (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 50.00 360.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt index 370bd48..fc5d8a2 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt @@ -5,6 +5,7 @@ Not scaled: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 600.00 0.00) @@ -30,6 +31,7 @@ Scale=0.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 1008.00) @@ -69,6 +71,7 @@ Scale=1.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt index 98c6452..fc414fb 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt @@ -5,6 +5,7 @@ Not scaled: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 600.00 100.00) @@ -31,6 +32,7 @@ Scale=0.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 1008.00) @@ -70,6 +72,7 @@ Scale=1.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt index cb4124a..d62e176 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 5021.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 108.00 113.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt index 8e43a7f..671b452 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt @@ -5,6 +5,7 @@ TEST (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt index fb3a538..471b16a 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt index 434eeb4..fcb69da 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 812.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 18.00 120.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt index 4cf968d..4305e9e 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt @@ -5,6 +5,7 @@ Before: (GraphicsLayer (bounds 785.00 802.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 17.00 119.00) @@ -46,6 +47,7 @@ After: (GraphicsLayer (bounds 785.00 802.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 17.00 119.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt index 131a359..7a85569 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt index 2df5374..1e03528 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (anchor 1.56 0.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt index cca1ede..f862b60 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 50.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt index 8d2d3f9..e20a928 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt @@ -5,6 +5,7 @@ Before: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 108.00 108.00) @@ -26,6 +27,7 @@ After: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 5 (GraphicsLayer (position 108.00 108.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt index 6930da3..97ed0a8 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 100.00 100.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt index 51cb939..71b76ae 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 23.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt index 9e5510c..7562942 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 108.00 108.00) @@ -68,6 +69,7 @@ After: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 5 (GraphicsLayer (position 108.00 108.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt index 47acbdf..0d1f850 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/rotate3d-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/rotate3d-overlap-expected.txt index 6b92cb0..23500b9 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/rotate3d-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/rotate3d-overlap-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 25.00 25.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt index f07d678..467133e 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt @@ -5,6 +5,7 @@ scroll me (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt index c4712c7..8428d2b 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt index f99c8d9..f3a2362 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt index d55b037..826eb24 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt index 10dde12..502db84 100644 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/masks/mask-layer-size-expected.txt b/third_party/WebKit/LayoutTests/compositing/masks/mask-layer-size-expected.txt index f73e122..e56a5d7 100644 --- a/third_party/WebKit/LayoutTests/compositing/masks/mask-layer-size-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/masks/mask-layer-size-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt index 07a389ea..190e9e5 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt @@ -6,6 +6,7 @@ flat (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt index 916365a..a2e72d8 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 48.00 38.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt index 2f951d0..3cd044b 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 28.00 20.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-paint-phases-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-paint-phases-expected.txt index 5411db0..88eeff3 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-paint-phases-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-paint-phases-expected.txt @@ -9,6 +9,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (paintingPhases GraphicsLayerPaintBackground GraphicsLayerPaintForeground diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/content-loses-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/content-loses-scrollbars-expected.txt index ad5acdf..3947e94 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/content-loses-scrollbars-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/content-loses-scrollbars-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt index 0d2eee7..3546f2d 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt index 75b4250..db29d79 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 320.00 340.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt index c6dab52..30e61c7 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/textarea-scroll-touch-expected.txt index de67171..db101e6 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/textarea-scroll-touch-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/textarea-scroll-touch-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt index 807560a..3add435 100644 --- a/third_party/WebKit/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/repaint/resize-repaint-expected.txt b/third_party/WebKit/LayoutTests/compositing/repaint/resize-repaint-expected.txt index 1cde8f5..4f9ae15 100644 --- a/third_party/WebKit/LayoutTests/compositing/repaint/resize-repaint-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/repaint/resize-repaint-expected.txt @@ -1,13 +1,14 @@ -(repaint rects - (rect 8 10 784 205) - (rect 0 23 800 205) -) (GraphicsLayer (bounds 800.00 600.00) (children 1 (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) + (repaint rects + (rect 8.00 10.00 784.00 205.00) + (rect 0.00 23.00 800.00 205.00) + ) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt index 6e87875..8b3d0e4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 50.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt index dabac0b..d03e5d4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 265.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt index d4660c2..191add4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 51.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt index 6e87875..8b3d0e4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 50.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt index dabac0b..d03e5d4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 265.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt index d4660c2..191add4 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 51.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt index 4074582e..c931cdc 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt index d56ce49..b8a4955 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt index e0ddbe0..30c536d 100644 --- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 642.00 58.00) diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-e.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-e.html index 03072ff..bbb04fa 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-e.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-e.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, 50, 0); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-n.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-n.html index c9cf4a6..eb2d336 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-n.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-n.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, 0, -50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-ne.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-ne.html index 587c64c..218f9e2 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-ne.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-ne.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, 50, -50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-nw.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-nw.html index 2dbddde..b8f4f4c 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-nw.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-nw.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, -50, -50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-s.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-s.html index 81a5a7c..84f3061 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-s.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-s.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, 0, 50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-se.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-se.html index a715c35..fb2cf4e 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-se.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-se.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, 50, 50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-sw.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-sw.html index 882ba07..b8689f1 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-sw.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-sw.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, -50, 50); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-w.html b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-w.html index c5ae7a1..f897df0 100644 --- a/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-w.html +++ b/third_party/WebKit/LayoutTests/compositing/rubberbanding/transform-overhang-w.html @@ -11,6 +11,7 @@ testRunner.dumpAsText(true); document.getElementById('info').style.visibility = "hidden"; internals.settings.setMockScrollbarsEnabled(false); + document.body.offsetTop; internals.setScrollViewPosition(document, -50, 0); } </script> diff --git a/third_party/WebKit/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt b/third_party/WebKit/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt index 26dc9b1..a90065f 100644 --- a/third_party/WebKit/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-clamped-expected.txt b/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-clamped-expected.txt index 17477f0..a81b9fc 100644 --- a/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-clamped-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-clamped-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 58.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt b/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt index e48682e..de8904a 100644 --- a/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 58.00 50.00) diff --git a/third_party/WebKit/LayoutTests/compositing/tiling/tiled-layer-resize-expected.txt b/third_party/WebKit/LayoutTests/compositing/tiling/tiled-layer-resize-expected.txt index 4567af7..aa177ce 100644 --- a/third_party/WebKit/LayoutTests/compositing/tiling/tiled-layer-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/tiling/tiled-layer-resize-expected.txt @@ -5,6 +5,7 @@ Tiled layer (GraphicsLayer (bounds 808.00 2121.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt index 509d210..fdc8cb0 100644 --- a/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 60.00 0.00) diff --git a/third_party/WebKit/LayoutTests/compositing/visibility/layer-visible-content-expected.txt b/third_party/WebKit/LayoutTests/compositing/visibility/layer-visible-content-expected.txt index 5932fb5..57837a2 100644 --- a/third_party/WebKit/LayoutTests/compositing/visibility/layer-visible-content-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/visibility/layer-visible-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 200.00 200.00) diff --git a/third_party/WebKit/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/WebKit/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt index 7813580..f3cfe0f 100644 --- a/third_party/WebKit/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt @@ -9,6 +9,7 @@ Initial (GraphicsLayer (bounds 785.00 626.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -51,11 +52,12 @@ Initial After step 1 (GraphicsLayer - (bounds 785.00 1366.00) + (bounds 785.00 1382.00) (children 1 (GraphicsLayer - (bounds 785.00 1366.00) + (bounds 785.00 1382.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -97,11 +99,12 @@ After step 1 After step 2 (GraphicsLayer - (bounds 785.00 2089.00) + (bounds 785.00 2121.00) (children 1 (GraphicsLayer - (bounds 785.00 2089.00) + (bounds 785.00 2121.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt index 5b3072f..8976be9 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 30.00 30.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt index 7ad8318..ee5ac4e 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 30.00 30.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt index 140f7b9..286b08b 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 50.00 50.00) @@ -31,6 +32,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 50.00 50.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt index f42fc44..e3b63bd 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 250.00 250.00) @@ -22,6 +23,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 250.00 250.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt index f42fc44..e3b63bd 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 250.00 250.00) @@ -22,6 +23,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 250.00 250.00) diff --git a/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt index a95ee8a4..e61bbd5 100644 --- a/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt +++ b/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/scrolling-without-painting-expected.txt index 97b229a..26d4eda 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/updating-scrolling-content-expected.txt index 1e58eef..2ff438b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/compositing/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport-expected.txt index 75b4250..db29d79 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 320.00 340.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt index 97b229a..26d4eda 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt index 1e58eef..2ff438b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport-expected.txt index 75b4250..db29d79 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 320.00 340.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt index 97b229a..26d4eda 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt index 1e58eef..2ff438b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt index d4660c2..191add4 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 51.00 50.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt index d56ce49..b8a4955 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-linux/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-expected.txt index f29d8d5..eebad8a 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-overlap-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-overlap-expected.txt index 3709915..bf67044 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-clip-overlap-expected.txt @@ -6,6 +6,7 @@ This layer should have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-perspective-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-perspective-expected.txt index 2fe7f70..a9fd928 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-perspective-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/backing/no-backing-for-perspective-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt index fd1527e..15e2f45 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt index d9ee504..1566065 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 5 (GraphicsLayer (anchor 0.10 0.20) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/composited-in-columns-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/composited-in-columns-expected.txt index 0855045..d09f735 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/composited-in-columns-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/composited-in-columns-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 14.00 162.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt index e2dfde3..3cb2cbb 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt @@ -10,6 +10,7 @@ Second dump layer tree: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt index f479751..262ea04 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 21.00 21.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/preserve-3d-switching-expected.txt index 6a1a46a..60733ab 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/preserve-3d-switching-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/geometry/preserve-3d-switching-expected.txt @@ -7,6 +7,7 @@ The green box appear angled out from the yellow box and embedded in it. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 108.00 73.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/iframes/invisible-nested-iframe-show-expected.txt index be6b095..4ada86b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/iframes/invisible-nested-iframe-show-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/iframes/invisible-nested-iframe-show-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 358.00 208.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt index b550c7f..392b531 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt @@ -7,6 +7,7 @@ This layer should be composited. (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 390.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/overflow/textarea-scroll-touch-expected.txt index 7e06711..5d86359 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/overflow/textarea-scroll-touch-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/overflow/textarea-scroll-touch-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt index 259ab5e..9fdc0ac 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt @@ -1,14 +1,15 @@ -(repaint rects - (rect 8 13 784 15) - (rect 8 413 784 28) - (rect 0 421 800 28) -) (GraphicsLayer (bounds 800.00 600.00) (children 1 (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) + (repaint rects + (rect 8.00 13.00 784.00 15.00) + (rect 8.00 413.00 784.00 28.00) + (rect 0.00 421.00 800.00 28.00) + ) (children 1 (GraphicsLayer (position 8.00 41.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt index 2665fed..a1b95e8 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt @@ -6,6 +6,7 @@ From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. (GraphicsLayer (bounds 785.00 5111.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-add-remove-child-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-add-remove-child-expected.txt index 2246751..4cf887a 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-add-remove-child-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-add-remove-child-expected.txt @@ -7,6 +7,7 @@ First (no children): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) @@ -28,6 +29,7 @@ Second (child added): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) @@ -58,6 +60,7 @@ Third (child removed): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-img-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-img-expected.txt index 09b01a8..ecc9f38 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-img-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-img-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 20053.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-expected.txt index 9f05b6c..1727548 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-expected.txt @@ -7,6 +7,7 @@ This is some text (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt index 221fedc..0dc1d4d 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt @@ -7,6 +7,7 @@ First (small layer): (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) @@ -44,6 +45,7 @@ Second (huge layer): (GraphicsLayer (bounds 785.00 5111.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) @@ -81,6 +83,7 @@ Third (small layer): (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/tile-cache-zoomed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/tile-cache-zoomed-expected.txt index 86ddfa2..4f62ce2 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/tile-cache-zoomed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/tiling/tile-cache-zoomed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 1208.00 2594.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt index 6abb49b..e4bb5cd 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/compositing/visibility/visibility-image-layers-dynamic-expected.txt @@ -9,6 +9,7 @@ Initial (GraphicsLayer (bounds 785.00 626.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -51,11 +52,12 @@ Initial After step 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (children 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -97,11 +99,12 @@ After step 1 After step 2 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (children 1 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-animation-layertree-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-animation-layertree-expected.txt index cded322..ce65010 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-animation-layertree-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-animation-layertree-expected.txt @@ -8,6 +8,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-transition-layertree-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-transition-layertree-expected.txt index cded322..ce65010 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-transition-layertree-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/css3/filters/composited-during-transition-layertree-expected.txt @@ -8,6 +8,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-expected.txt index f29d8d5..eebad8a 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-overlap-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-overlap-expected.txt index 3709915..bf67044 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-clip-overlap-expected.txt @@ -6,6 +6,7 @@ This layer should have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-perspective-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-perspective-expected.txt index 2fe7f70..a9fd928 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-perspective-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/backing/no-backing-for-perspective-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt index fd1527e..15e2f45 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt index d9ee504..1566065 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 5 (GraphicsLayer (anchor 0.10 0.20) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt index 0855045..d09f735 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 14.00 162.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt index e2dfde3..3cb2cbb 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt @@ -10,6 +10,7 @@ Second dump layer tree: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/limit-layer-bounds-overflow-root-expected.txt index f479751..262ea04 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/limit-layer-bounds-overflow-root-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/limit-layer-bounds-overflow-root-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 21.00 21.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/preserve-3d-switching-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/preserve-3d-switching-expected.txt index 6a1a46a..60733ab 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/preserve-3d-switching-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/geometry/preserve-3d-switching-expected.txt @@ -7,6 +7,7 @@ The green box appear angled out from the yellow box and embedded in it. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 108.00 73.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt index be6b095..4ada86b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 358.00 208.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/no-compositing-for-preserve-3d-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/no-compositing-for-preserve-3d-expected.txt index b550c7f..392b531 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/no-compositing-for-preserve-3d-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/no-compositing-for-preserve-3d-expected.txt @@ -7,6 +7,7 @@ This layer should be composited. (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 390.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/scroll-partial-update-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/scroll-partial-update-expected.txt index f07d678..467133e 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/scroll-partial-update-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/layer-creation/scroll-partial-update-expected.txt @@ -5,6 +5,7 @@ scroll me (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt index 259ab5e..9fdc0ac 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt @@ -1,14 +1,15 @@ -(repaint rects - (rect 8 13 784 15) - (rect 8 413 784 28) - (rect 0 421 800 28) -) (GraphicsLayer (bounds 800.00 600.00) (children 1 (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) + (repaint rects + (rect 8.00 13.00 784.00 15.00) + (rect 8.00 413.00 784.00 28.00) + (rect 0.00 421.00 800.00 28.00) + ) (children 1 (GraphicsLayer (position 8.00 41.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt index d4660c2..191add4 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 1000.00 1000.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 51.00 50.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt index ebf2adc..110ba4b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt index d56ce49..b8a4955 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/crash-reparent-tiled-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/crash-reparent-tiled-layer-expected.txt index 2665fed..a1b95e8 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/crash-reparent-tiled-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/crash-reparent-tiled-layer-expected.txt @@ -6,6 +6,7 @@ From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. (GraphicsLayer (bounds 785.00 5111.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-add-remove-child-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-add-remove-child-expected.txt index 2246751..4cf887a 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-add-remove-child-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-add-remove-child-expected.txt @@ -7,6 +7,7 @@ First (no children): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) @@ -28,6 +29,7 @@ Second (child added): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) @@ -58,6 +60,7 @@ Third (child removed): (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt index 09b01a8..ecc9f38 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 20053.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-expected.txt index 9f05b6c..1727548 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-expected.txt @@ -7,6 +7,7 @@ This is some text (GraphicsLayer (bounds 785.00 5129.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 86.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-resize-expected.txt index 221fedc..0dc1d4d 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/huge-layer-with-layer-children-resize-expected.txt @@ -7,6 +7,7 @@ First (small layer): (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) @@ -44,6 +45,7 @@ Second (huge layer): (GraphicsLayer (bounds 785.00 5111.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) @@ -81,6 +83,7 @@ Third (small layer): (GraphicsLayer (bounds 785.00 611.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 68.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt index 86ddfa2..4f62ce2 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 1208.00 2594.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/visibility/visibility-image-layers-dynamic-expected.txt index 6abb49b..e4bb5cd 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/visibility/visibility-image-layers-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/softwarecompositing/visibility/visibility-image-layers-dynamic-expected.txt @@ -9,6 +9,7 @@ Initial (GraphicsLayer (bounds 785.00 626.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -51,11 +52,12 @@ Initial After step 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (children 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -97,11 +99,12 @@ After step 1 After step 2 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (children 1 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt index 6abb49b..e4bb5cd 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-mac/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt @@ -9,6 +9,7 @@ Initial (GraphicsLayer (bounds 785.00 626.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -51,11 +52,12 @@ Initial After step 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (children 1 (GraphicsLayer - (bounds 785.00 1321.00) + (bounds 785.00 1336.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) @@ -97,11 +99,12 @@ After step 1 After step 2 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (children 1 (GraphicsLayer - (bounds 785.00 2000.00) + (bounds 785.00 2030.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 14.00 6.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-expected.txt index d3b0ce5..d7f8e16 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-overlap-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-overlap-expected.txt index be3a69b..11ac616 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-overlap-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-overlap-expected.txt @@ -6,6 +6,7 @@ This layer should have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-perspective-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-perspective-expected.txt index 14e495d..7fce9e5 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-perspective-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-perspective-expected.txt @@ -6,6 +6,7 @@ This layer should not have backing store. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt index ea6ad73..22e9e79 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt index a9274aa..5b80c91 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt @@ -6,6 +6,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 5 (GraphicsLayer (anchor 0.10 0.20) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/composited-in-columns-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/composited-in-columns-expected.txt index 4f13943..c936b71 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/composited-in-columns-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/composited-in-columns-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 14.00 164.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt index ced86af..313046e 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt @@ -10,6 +10,7 @@ Second dump layer tree: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-switch-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-switch-expected.txt index 9921df2..211e726 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-switch-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-switch-expected.txt @@ -10,6 +10,7 @@ Second dump layer tree: (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt index 0ad90cf..747cc08 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 21.00 21.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/preserve-3d-switching-expected.txt index 2c31aed..4ee466e 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/preserve-3d-switching-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/geometry/preserve-3d-switching-expected.txt @@ -7,6 +7,7 @@ The green box appear angled out from the yellow box and embedded in it. (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 108.00 72.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/iframes/invisible-nested-iframe-show-expected.txt index 8d54c01..2926830 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/iframes/invisible-nested-iframe-show-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/iframes/invisible-nested-iframe-show-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 358.00 208.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt index 8d885f5..e10cbd0 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt @@ -7,6 +7,7 @@ This layer should be composited. (GraphicsLayer (bounds 785.00 618.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 394.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/repaint/invalidations-on-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/repaint/invalidations-on-composited-layers-expected.txt index b735dab..b065351 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/repaint/invalidations-on-composited-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/repaint/invalidations-on-composited-layers-expected.txt @@ -1,14 +1,15 @@ -(repaint rects - (rect 8 13 784 16) - (rect 8 413 784 29) - (rect 0 421 800 29) -) (GraphicsLayer (bounds 800.00 600.00) (children 1 (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) + (repaint rects + (rect 8.00 13.00 784.00 16.00) + (rect 8.00 413.00 784.00 29.00) + (rect 0.00 421.00 800.00 29.00) + ) (children 1 (GraphicsLayer (position 8.00 42.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/crash-reparent-tiled-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/crash-reparent-tiled-layer-expected.txt index 3b9b1e7..3eaae23 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/crash-reparent-tiled-layer-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/crash-reparent-tiled-layer-expected.txt @@ -6,6 +6,7 @@ From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. (GraphicsLayer (bounds 785.00 5116.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 72.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-add-remove-child-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-add-remove-child-expected.txt index 2f5cd82..35f61cf 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-add-remove-child-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-add-remove-child-expected.txt @@ -7,6 +7,7 @@ First (no children): (GraphicsLayer (bounds 785.00 5136.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 92.00) @@ -28,6 +29,7 @@ Second (child added): (GraphicsLayer (bounds 785.00 5136.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 92.00) @@ -58,6 +60,7 @@ Third (child removed): (GraphicsLayer (bounds 785.00 5136.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 92.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-img-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-img-expected.txt index 509ddf3..85e4e54 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-img-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-img-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 20055.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-expected.txt index 4c45db6..2a707ee7 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-expected.txt @@ -7,6 +7,7 @@ This is some text (GraphicsLayer (bounds 785.00 5116.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 72.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt index 5a02f90..c8a73c1 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt @@ -7,6 +7,7 @@ First (small layer): (GraphicsLayer (bounds 785.00 616.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 72.00) @@ -44,6 +45,7 @@ Second (huge layer): (GraphicsLayer (bounds 785.00 5116.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 72.00) @@ -81,6 +83,7 @@ Third (small layer): (GraphicsLayer (bounds 785.00 616.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 72.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/tile-cache-zoomed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/tile-cache-zoomed-expected.txt index a683789..43d723b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/tile-cache-zoomed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/compositing/tiling/tile-cache-zoomed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 1208.00 2598.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-animation-layertree-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-animation-layertree-expected.txt index b4db42f..3ec97fa 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-animation-layertree-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-animation-layertree-expected.txt @@ -8,6 +8,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-transition-layertree-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-transition-layertree-expected.txt index b4db42f..3ec97fa 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-transition-layertree-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/css3/filters/composited-during-transition-layertree-expected.txt @@ -8,6 +8,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 18.00 18.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt index 4f13943..c936b71 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/geometry/composited-in-columns-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 14.00 164.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt index 8d54c01..2926830 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (bounds 358.00 208.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt index 509ddf3..85e4e54 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/huge-layer-img-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 20055.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt index a683789..43d723b 100644 --- a/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/chromium-win/virtual/softwarecompositing/tiling/tile-cache-zoomed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 1208.00 2598.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/deferred/fast/images/repaint-subrect-grid-expected.txt b/third_party/WebKit/LayoutTests/virtual/deferred/fast/images/repaint-subrect-grid-expected.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/third_party/WebKit/LayoutTests/virtual/deferred/fast/images/repaint-subrect-grid-expected.txt @@ -0,0 +1 @@ + diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container-expected.txt index 2f951d0..3cd044b 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 28.00 20.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-paint-phases-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-paint-phases-expected.txt index 5411db0..88eeff3 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-paint-phases-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/composited-scrolling-paint-phases-expected.txt @@ -9,6 +9,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (paintingPhases GraphicsLayerPaintBackground GraphicsLayerPaintForeground diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-expected.txt index 8f21530..5160cecf 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt index 8f21530..5160cecf 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-overlay-with-touch-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-overlay-with-touch-expected.txt index e2d3f19..dabe21d 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-overlay-with-touch-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-overlay-with-touch-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt index 0d2eee7..3546f2d 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt index c6dab52..30e61c7 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt index 807560a..3add435 100644 --- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt index c263870..1c6c904 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 785.00 5013.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 100.00 3100.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt index 68d299d..0b3423e 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt @@ -5,6 +5,7 @@ middle (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 3 (GraphicsLayer (position 129.00 29.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt index 236ad7a..334adeb 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 58.00 58.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt index c622e03..1e313ae 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position -12.00 -12.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt index 2d7f103..82fefba 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt @@ -7,6 +7,7 @@ When the parent document becomes composited, the layer trees should get connecte (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 108.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt index 51c7bea..6342514 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt index bd0181c..032cf17 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt index b558cef..b7f10c5 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 28.00 28.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt index 631175d..8400aaa 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt index 2fdf33b..436739b 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt @@ -5,6 +5,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt index 1924f23..414e635 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt @@ -6,6 +6,7 @@ Should be composited (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt index 370bd48..fc5d8a2 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt @@ -5,6 +5,7 @@ Not scaled: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 600.00 0.00) @@ -30,6 +31,7 @@ Scale=0.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 1008.00) @@ -69,6 +71,7 @@ Scale=1.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt index 98c6452..fc414fb 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt @@ -5,6 +5,7 @@ Not scaled: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 2 (GraphicsLayer (position 600.00 100.00) @@ -31,6 +32,7 @@ Scale=0.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 1008.00) @@ -70,6 +72,7 @@ Scale=1.5: (GraphicsLayer (bounds 785.00 4016.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 10.00 10.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt index 2f951d0..3cd044b 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 28.00 20.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-paint-phases-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-paint-phases-expected.txt index 5411db0..88eeff3 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-paint-phases-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/composited-scrolling-paint-phases-expected.txt @@ -9,6 +9,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (paintingPhases GraphicsLayerPaintBackground GraphicsLayerPaintForeground diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt index 49c3cff..8366085f 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 4 (GraphicsLayer (position 8.00 13.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt index 0d2eee7..3546f2d 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 18.00 10.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt index c6dab52..30e61c7 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/scrolling-without-painting-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt index 807560a..3add435 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (position 8.00 8.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt index 4074582e..c931cdc 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt index 59d645e..6e6b538 100644 --- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt @@ -4,6 +4,7 @@ (GraphicsLayer (bounds 800.00 600.00) (contentsOpaque 1) + (drawsContent 1) (children 1 (GraphicsLayer (bounds 400.00 400.00) diff --git a/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp b/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp index 37c1f53..d7a866f 100644 --- a/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp +++ b/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp @@ -342,8 +342,6 @@ 'src/InspectorFrontendClientImpl.h', 'src/LinkHighlight.cpp', 'src/LinkHighlight.h', - 'src/NonCompositedContentHost.cpp', - 'src/NonCompositedContentHost.h', 'src/PrerendererClientImpl.h', 'src/PrerendererClientImpl.cpp', 'src/android/WebInputEventFactory.cpp', diff --git a/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.cpp b/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.cpp index 465b0f2..ec65ee1 100644 --- a/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.cpp +++ b/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.cpp @@ -27,7 +27,6 @@ #include "LinkHighlight.h" -#include "NonCompositedContentHost.h" #include "SkMatrix44.h" #include "WebFrameImpl.h" #include "WebKit.h" @@ -66,7 +65,6 @@ LinkHighlight::LinkHighlight(Node* node, WebViewImpl* owningWebViewImpl) : m_node(node) , m_owningWebViewImpl(owningWebViewImpl) , m_currentGraphicsLayer(0) - , m_usingNonCompositedContentHost(false) , m_geometryNeedsUpdate(false) , m_isAnimating(false) , m_startTime(monotonicallyIncreasingTime()) @@ -129,13 +127,6 @@ RenderLayer* LinkHighlight::computeEnclosingCompositingLayer() return 0; GraphicsLayerChromium* newGraphicsLayer = static_cast<GraphicsLayerChromium*>(renderLayer->backing()->graphicsLayer()); - m_clipLayer->setSublayerTransform(SkMatrix44()); - m_usingNonCompositedContentHost = !newGraphicsLayer->drawsContent(); - if (m_usingNonCompositedContentHost ) { - m_clipLayer->setSublayerTransform(newGraphicsLayer->platformLayer()->transform()); - newGraphicsLayer = static_cast<GraphicsLayerChromium*>(m_owningWebViewImpl->nonCompositedContentHost()->topLevelRootLayer()); - } - if (m_currentGraphicsLayer != newGraphicsLayer) { if (m_currentGraphicsLayer) clearGraphicsLayerLinkHighlightPointer(); @@ -197,22 +188,20 @@ bool LinkHighlight::computeHighlightLayerPathAndPosition(RenderLayer* compositin ASSERT(quads.size()); FloatRect positionAdjust; - if (!m_usingNonCompositedContentHost) { - const RenderStyle* style = m_node->renderer()->style(); - // If we have a box shadow, and are non-relative, then must manually adjust - // for its size. - if (const ShadowData* shadow = style->boxShadow()) { - int outlineSize = m_node->renderer()->outlineStyleForRepaint()->outlineSize(); - shadow->adjustRectForShadow(positionAdjust, outlineSize); - } + const RenderStyle* style = m_node->renderer()->style(); + // If we have a box shadow, and are non-relative, then must manually adjust + // for its size. + if (const ShadowData* shadow = style->boxShadow()) { + int outlineSize = m_node->renderer()->outlineStyleForRepaint()->outlineSize(); + shadow->adjustRectForShadow(positionAdjust, outlineSize); + } - // If absolute or fixed, need to subtract out our fixed positioning. - // FIXME: should we use RenderLayer::staticBlockPosition() here instead? - // Perhaps consider this if out-of-flow elements cause further problems. - if (m_node->renderer()->isOutOfFlowPositioned()) { - FloatPoint delta(style->left().getFloatValue(), style->top().getFloatValue()); - positionAdjust.moveBy(delta); - } + // If absolute or fixed, need to subtract out our fixed positioning. + // FIXME: should we use RenderLayer::staticBlockPosition() here instead? + // Perhaps consider this if out-of-flow elements cause further problems. + if (m_node->renderer()->isOutOfFlowPositioned()) { + FloatPoint delta(style->left().getFloatValue(), style->top().getFloatValue()); + positionAdjust.moveBy(delta); } Path newPath; diff --git a/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.h b/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.h index f2c0009..6513a88 100644 --- a/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.h +++ b/third_party/WebKit/Source/WebKit/chromium/src/LinkHighlight.h @@ -90,7 +90,6 @@ private: OwnPtr<WebAnimation> m_animation; WebViewImpl* m_owningWebViewImpl; WebCore::GraphicsLayerChromium* m_currentGraphicsLayer; - bool m_usingNonCompositedContentHost; bool m_geometryNeedsUpdate; bool m_isAnimating; diff --git a/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.cpp b/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.cpp deleted file mode 100644 index 5f8456d..0000000 --- a/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.cpp +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" - -#include "NonCompositedContentHost.h" - -#include "WebViewImpl.h" -#include "core/page/Settings.h" -#include "core/platform/graphics/FloatPoint.h" -#include "core/platform/graphics/FloatRect.h" -#include "core/platform/graphics/GraphicsLayer.h" -#include "core/platform/graphics/chromium/GraphicsLayerChromium.h" -#include <public/WebContentLayer.h> -#include <public/WebFloatPoint.h> - -namespace WebKit { - -NonCompositedContentHost::NonCompositedContentHost(WebViewImpl* webView, WebCore::GraphicsLayerFactory* graphicsLayerFactory) - : m_webView(webView) - , m_showDebugBorders(false) -{ - m_graphicsLayer = WebCore::GraphicsLayer::create(graphicsLayerFactory, this); -#ifndef NDEBUG - m_graphicsLayer->setName("non-composited content"); -#endif - m_graphicsLayer->setDrawsContent(true); - m_graphicsLayer->setContentsOpaque(true); - // FIXME: Remove LCD text setting after it is implemented in chromium. - WebContentLayer* layer = static_cast<WebCore::GraphicsLayerChromium*>(m_graphicsLayer.get())->contentLayer(); - layer->setUseLCDText(true); -#if !OS(ANDROID) - layer->setDrawCheckerboardForMissingTiles(true); -#endif -} - -NonCompositedContentHost::~NonCompositedContentHost() -{ -} - -void NonCompositedContentHost::setBackgroundColor(const WebCore::Color& color) -{ - m_graphicsLayer->platformLayer()->setBackgroundColor(color.rgb()); -} - -void NonCompositedContentHost::setOpaque(bool opaque) -{ - m_graphicsLayer->setContentsOpaque(opaque); -} - -void NonCompositedContentHost::setScrollLayer(WebCore::GraphicsLayer* layer) -{ - m_graphicsLayer->setNeedsDisplay(); - - if (!layer) { - m_graphicsLayer->removeFromParent(); - return; - } - - if (layer->platformLayer() == scrollLayer()) - return; - - layer->addChildAtIndex(m_graphicsLayer.get(), 0); - ASSERT(haveScrollLayer()); -} - -void NonCompositedContentHost::setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) -{ - if (!haveScrollLayer()) - return; - - bool visibleRectChanged = m_viewportSize != viewportSize; - - m_viewportSize = viewportSize; - WebLayer* layer = scrollLayer(); - layer->setScrollPosition(scrollPosition + scrollOrigin); - layer->setPosition(WebFloatPoint(-scrollPosition)); - // Due to the possibility of pinch zoom, the noncomposited layer is always - // assumed to be scrollable. - layer->setScrollable(true); - m_graphicsLayer->setSize(contentsSize); - - // In RTL-style pages, the origin of the initial containing block for the - // root layer may be positive; translate the layer to avoid negative - // coordinates. - m_layerAdjust = -toIntSize(scrollOrigin); - if (m_graphicsLayer->transform().m41() != m_layerAdjust.width() || m_graphicsLayer->transform().m42() != m_layerAdjust.height()) { - WebCore::TransformationMatrix transform = m_graphicsLayer->transform(); - transform.setM41(m_layerAdjust.width()); - transform.setM42(m_layerAdjust.height()); - m_graphicsLayer->setTransform(transform); - - // If a tiled layer is shifted left or right, the content that goes into - // each tile will change. Invalidate the entire layer when this happens. - m_graphicsLayer->setNeedsDisplay(); - } else if (visibleRectChanged) - m_graphicsLayer->setNeedsDisplay(); -} - -bool NonCompositedContentHost::haveScrollLayer() -{ - return m_graphicsLayer->parent(); -} - -WebLayer* NonCompositedContentHost::scrollLayer() -{ - if (!m_graphicsLayer->parent()) - return 0; - return m_graphicsLayer->parent()->platformLayer(); -} - -void NonCompositedContentHost::invalidateRect(const WebCore::IntRect& rect) -{ - WebCore::IntRect layerRect = rect; - layerRect.move(-m_layerAdjust); - m_graphicsLayer->setNeedsDisplayInRect(WebCore::FloatRect(layerRect)); -} - -void NonCompositedContentHost::notifyAnimationStarted(const WebCore::GraphicsLayer*, double /* time */) -{ - // Intentionally left empty since we don't support animations on the non-composited content. -} - -void NonCompositedContentHost::paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext& context, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect) -{ - context.translate(-m_layerAdjust); - WebCore::IntRect adjustedClipRect = clipRect; - adjustedClipRect.move(m_layerAdjust); - m_webView->paintRootLayer(context, adjustedClipRect); -} - -void NonCompositedContentHost::setShowDebugBorders(bool showDebugBorders) -{ - m_showDebugBorders = showDebugBorders; - m_graphicsLayer->updateDebugIndicators(); -} - -bool NonCompositedContentHost::isTrackingRepaints() const -{ - return m_webView->isTrackingRepaints(); -} - -} // namespace WebKit diff --git a/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.h b/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.h deleted file mode 100644 index f224b51..0000000 --- a/third_party/WebKit/Source/WebKit/chromium/src/NonCompositedContentHost.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef NonCompositedContentHost_h -#define NonCompositedContentHost_h - -#include "core/platform/graphics/GraphicsLayerClient.h" -#include "core/platform/graphics/IntSize.h" - -#include <public/WebLayer.h> -#include <wtf/Noncopyable.h> -#include <wtf/OwnPtr.h> -#include <wtf/PassOwnPtr.h> - -namespace WebCore { -class Color; -class GraphicsLayer; -class GraphicsLayerFactory; -class GraphicsContext; -class IntPoint; -class IntRect; -} - -namespace WebKit { -class WebViewImpl; - -class NonCompositedContentHost : public WebCore::GraphicsLayerClient { -WTF_MAKE_NONCOPYABLE(NonCompositedContentHost); -public: - static PassOwnPtr<NonCompositedContentHost> create(WebViewImpl* webView, WebCore::GraphicsLayerFactory* graphicsLayerFactory) - { - return adoptPtr(new NonCompositedContentHost(webView, graphicsLayerFactory)); - } - virtual ~NonCompositedContentHost(); - - void invalidateRect(const WebCore::IntRect&); - void setBackgroundColor(const WebCore::Color&); - void setOpaque(bool); - void setScrollLayer(WebCore::GraphicsLayer*); - void setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin); - WebCore::GraphicsLayer* topLevelRootLayer() const { return m_graphicsLayer.get(); } - - void setShowDebugBorders(bool); - -protected: - NonCompositedContentHost(WebViewImpl*, WebCore::GraphicsLayerFactory*); - -private: - // GraphicsLayerClient - virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time); - virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect); - virtual bool isTrackingRepaints() const; - - bool haveScrollLayer(); - WebLayer* scrollLayer(); - - OwnPtr<WebCore::GraphicsLayer> m_graphicsLayer; - WebViewImpl* m_webView; - WebCore::IntSize m_viewportSize; - WebCore::IntSize m_layerAdjust; - - bool m_showDebugBorders; -}; - -} // namespace WebKit - -#endif // NonCompositedContentHost_h diff --git a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp index 6d03508..0c5107d 100644 --- a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp +++ b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp @@ -59,7 +59,6 @@ #include "GraphicsLayerFactoryChromium.h" #include "HTMLNames.h" #include "LinkHighlight.h" -#include "NonCompositedContentHost.h" #include "PageWidgetDelegate.h" #include "PrerendererClientImpl.h" #include "SpeechInputClientImpl.h" @@ -1785,6 +1784,8 @@ void WebViewImpl::layout() { TRACE_EVENT0("webkit", "WebViewImpl::layout"); PageWidgetDelegate::layout(m_page.get()); + if (m_layerTreeView) + m_layerTreeView->setBackgroundColor(backgroundColor()); if (m_linkHighlight) m_linkHighlight->updateGeometry(); @@ -2951,8 +2952,7 @@ void WebViewImpl::enableFixedLayoutMode(bool enable) frame->view()->setUseFixedLayout(enable); - // Also notify the base layer, which RenderLayerCompositor does not see. - if (m_nonCompositedContentHost) + if (m_isAcceleratedCompositingActive) updateLayerTreeViewport(); } @@ -3547,9 +3547,6 @@ void WebViewImpl::setIsTransparent(bool isTransparent) // Future frames check this to know whether to be transparent. m_isTransparent = isTransparent; - - if (m_nonCompositedContentHost) - m_nonCompositedContentHost->setOpaque(!isTransparent); } bool WebViewImpl::isTransparent() const @@ -3851,16 +3848,6 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer) m_rootLayer = layer ? layer->platformLayer() : 0; setIsAcceleratedCompositingActive(layer); - if (m_nonCompositedContentHost) { - GraphicsLayer* scrollLayer = 0; - if (layer) { - Document* document = page()->mainFrame()->document(); - RenderView* renderView = document->renderView(); - RenderLayerCompositor* compositor = renderView->compositor(); - scrollLayer = compositor->scrollLayer(); - } - m_nonCompositedContentHost->setScrollLayer(scrollLayer); - } if (m_layerTreeView) { if (m_rootLayer) @@ -3893,31 +3880,11 @@ void WebViewImpl::invalidateRect(const IntRect& rect) } if (m_isAcceleratedCompositingActive) { ASSERT(m_layerTreeView); - - if (!page()) - return; - - FrameView* view = page()->mainFrame()->view(); - IntRect dirtyRect = view->windowToContents(rect); updateLayerTreeViewport(); - m_nonCompositedContentHost->invalidateRect(dirtyRect); } else if (m_client) m_client->didInvalidateRect(rect); } -NonCompositedContentHost* WebViewImpl::nonCompositedContentHost() -{ - return m_nonCompositedContentHost.get(); -} - -void WebViewImpl::setBackgroundColor(const WebCore::Color& color) -{ - WebCore::Color documentBackgroundColor = color.isValid() ? color : WebCore::Color::white; - WebColor webDocumentBackgroundColor = documentBackgroundColor.rgb(); - m_nonCompositedContentHost->setBackgroundColor(documentBackgroundColor); - m_layerTreeView->setBackgroundColor(webDocumentBackgroundColor); -} - WebCore::GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const { return m_graphicsLayerFactory.get(); @@ -3946,22 +3913,6 @@ void WebViewImpl::scheduleAnimation() m_client->scheduleAnimation(); } -void WebViewImpl::paintRootLayer(GraphicsContext& context, const IntRect& contentRect) -{ - double paintStart = currentTime(); - if (!page()) - return; - FrameView* view = page()->mainFrame()->view(); - context.setUseHighResMarkers(page()->deviceScaleFactor() > 1.5f); - view->paintContents(&context, contentRect); - double paintEnd = currentTime(); - double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart); - WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30); - WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); - - setBackgroundColor(view->documentBackgroundColor()); -} - void WebViewImpl::setIsAcceleratedCompositingActive(bool active) { WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4); @@ -3994,10 +3945,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) } else { TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)"); - m_nonCompositedContentHost = NonCompositedContentHost::create(this, graphicsLayerFactory()); - m_nonCompositedContentHost->setShowDebugBorders(page()->settings()->showDebugBorders()); - m_nonCompositedContentHost->setOpaque(!isTransparent()); - m_client->initializeLayerTreeView(); m_layerTreeView = m_client->layerTreeView(); if (m_layerTreeView) { @@ -4007,6 +3954,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) m_layerTreeView->setVisible(visible); m_layerTreeView->setDeviceScaleFactor(page()->deviceScaleFactor()); m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor); + m_layerTreeView->setBackgroundColor(backgroundColor()); m_layerTreeView->setHasTransparentBackground(isTransparent()); updateLayerTreeViewport(); m_client->didActivateCompositor(m_inputHandlerIdentifier); @@ -4019,7 +3967,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) m_layerTreeView->setShowDebugBorders(m_showDebugBorders); m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled); } else { - m_nonCompositedContentHost.clear(); m_isAcceleratedCompositingActive = false; m_client->didDeactivateCompositor(); m_compositorCreationFailed = true; @@ -4090,11 +4037,9 @@ void WebViewImpl::didExitCompositingMode() void WebViewImpl::updateLayerTreeViewport() { - if (!page() || !m_nonCompositedContentHost || !m_layerTreeView) + if (!page() || !m_layerTreeView) return; - FrameView* view = page()->mainFrame()->view(); - m_nonCompositedContentHost->setViewport(m_size, view->contentsSize(), view->scrollPosition(), view->scrollOrigin()); m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor); } diff --git a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.h b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.h index 7f75f0d..b72a912 100644 --- a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.h +++ b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.h @@ -94,7 +94,6 @@ class ContextMenuClientImpl; class DeviceOrientationClientProxy; class GeolocationClientProxy; class LinkHighlight; -class NonCompositedContentHost; class PrerendererClientImpl; class SpeechInputClientImpl; class SpeechRecognitionClientProxy; @@ -523,9 +522,6 @@ public: void setRootGraphicsLayer(WebCore::GraphicsLayer*); void scheduleCompositingLayerSync(); void scrollRootLayerRect(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& clipRect); - void paintRootLayer(WebCore::GraphicsContext&, const WebCore::IntRect& contentRect); - NonCompositedContentHost* nonCompositedContentHost(); - void setBackgroundColor(const WebCore::Color&); WebCore::GraphicsLayerFactory* graphicsLayerFactory() const; void registerForAnimations(WebLayer*); void scheduleAnimation(); @@ -820,7 +816,6 @@ private: WebViewBenchmarkSupportImpl m_benchmarkSupport; WebCore::IntRect m_rootLayerScrollDamage; - OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost; WebLayerTreeView* m_layerTreeView; WebLayer* m_rootLayer; WebCore::GraphicsLayer* m_rootGraphicsLayer; diff --git a/third_party/WebKit/Source/core/rendering/RenderLayer.cpp b/third_party/WebKit/Source/core/rendering/RenderLayer.cpp index ec52ed3..12f44af 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayer.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayer.cpp @@ -1522,13 +1522,8 @@ void RenderLayer::setFilterBackendNeedsRepaintingInRect(const LayoutRect& rect) LayoutRect parentLayerRect = renderer()->localToContainerQuad(repaintQuad, parentLayer->renderer()).enclosingBoundingBox(); if (parentLayer->isComposited()) { - if (!parentLayer->backing()->paintsIntoWindow()) { - parentLayer->setBackingNeedsRepaintInRect(parentLayerRect); - return; - } - // If the painting goes to window, redirect the painting to the parent RenderView. - parentLayer = renderer()->view()->layer(); - parentLayerRect = renderer()->localToContainerQuad(repaintQuad, parentLayer->renderer()).enclosingBoundingBox(); + parentLayer->setBackingNeedsRepaintInRect(parentLayerRect); + return; } if (parentLayer->paintsWithFilters()) { @@ -3597,8 +3592,7 @@ void RenderLayer::paintLayer(GraphicsContext* context, const LayerPaintingInfo& // but we need to ensure that we don't cache clip rects computed with the wrong root in this case. if (context->updatingControlTints() || (paintingInfo.paintBehavior & PaintBehaviorFlattenCompositingLayers)) paintFlags |= PaintLayerTemporaryClipRects; - else if (!backing()->paintsIntoWindow() - && !backing()->paintsIntoCompositedAncestor() + else if (!backing()->paintsIntoCompositedAncestor() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection)) { // If this RenderLayer should paint into its backing, that will be done via RenderLayerBacking::paintIntoLayer(). return; @@ -5510,8 +5504,7 @@ GraphicsLayer* RenderLayer::layerForScrollCorner() const bool RenderLayer::paintsWithTransform(PaintBehavior paintBehavior) const { - bool paintsToWindow = !isComposited() || backing()->paintsIntoWindow(); - return transform() && ((paintBehavior & PaintBehaviorFlattenCompositingLayers) || paintsToWindow); + return transform() && ((paintBehavior & PaintBehaviorFlattenCompositingLayers) || !isComposited()); } bool RenderLayer::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const @@ -5767,14 +5760,7 @@ void RenderLayer::repaintIncludingDescendants() void RenderLayer::setBackingNeedsRepaint() { ASSERT(isComposited()); - if (backing()->paintsIntoWindow()) { - // If we're trying to repaint the placeholder document layer, propagate the - // repaint to the native view system. - RenderView* view = renderer()->view(); - if (view) - view->repaintViewRectangle(absoluteBoundingBox()); - } else - backing()->setContentsNeedDisplay(); + backing()->setContentsNeedDisplay(); } void RenderLayer::setBackingNeedsRepaintInRect(const LayoutRect& r) @@ -5782,7 +5768,7 @@ void RenderLayer::setBackingNeedsRepaintInRect(const LayoutRect& r) // https://bugs.webkit.org/show_bug.cgi?id=61159 describes an unreproducible crash here, // so assert but check that the layer is composited. ASSERT(isComposited()); - if (!isComposited() || backing()->paintsIntoWindow()) { + if (!isComposited()) { // If we're trying to repaint the placeholder document layer, propagate the // repaint to the native view system. LayoutRect absRect(r); diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp index 7423b13..12bf7e5 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp @@ -192,8 +192,12 @@ void RenderLayerBacking::createPrimaryGraphicsLayer() m_graphicsLayer = createGraphicsLayer(layerName); - if (m_isMainFrameRenderViewLayer) + if (m_isMainFrameRenderViewLayer) { m_graphicsLayer->setContentsOpaque(true); +#if !OS(ANDROID) + m_graphicsLayer->contentLayer()->setDrawCheckerboardForMissingTiles(true); +#endif + } updateOpacity(renderer()->style()); updateTransform(renderer()->style()); @@ -369,7 +373,7 @@ void RenderLayerBacking::updateAfterLayout(UpdateAfterLayoutFlags flags) } } - if (flags & NeedsFullRepaint && !paintsIntoWindow() && !paintsIntoCompositedAncestor()) + if (flags & NeedsFullRepaint && !paintsIntoCompositedAncestor()) setContentsNeedDisplay(); } @@ -1318,7 +1322,7 @@ bool RenderLayerBacking::hasVisibleNonCompositingDescendantLayers() const bool RenderLayerBacking::containsPaintedContent() const { - if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection()) + if (isSimpleContainerCompositingLayer() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection()) return false; if (isDirectlyCompositedImage()) @@ -1501,15 +1505,6 @@ GraphicsLayer* RenderLayerBacking::childForSuperlayers() const return m_graphicsLayer.get(); } -bool RenderLayerBacking::paintsIntoWindow() const -{ - if (m_owningLayer->isRootLayer()) { - return compositor()->rootLayerAttachment() != RenderLayerCompositor::RootLayerAttachedViaEnclosingFrame; - } - - return false; -} - void RenderLayerBacking::setRequiresOwnBackingStore(bool requiresOwnBacking) { if (requiresOwnBacking == m_requiresOwnBackingStore) @@ -1590,7 +1585,7 @@ void RenderLayerBacking::paintIntoLayer(const GraphicsLayer* graphicsLayer, Grap const IntRect& paintDirtyRect, // In the coords of rootLayer. PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase) { - if (paintsIntoWindow() || paintsIntoCompositedAncestor()) { + if (paintsIntoCompositedAncestor()) { ASSERT_NOT_REACHED(); return; } diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.h b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.h index 29127e0..86ef06a 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.h +++ b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.h @@ -100,14 +100,6 @@ public: GraphicsLayer* parentForSublayers() const; GraphicsLayer* childForSuperlayers() const; - // RenderLayers with backing normally short-circuit paintLayer() because - // their content is rendered via callbacks from GraphicsLayer. However, the document - // layer is special, because it has a GraphicsLayer to act as a container for the GraphicsLayers - // for descendants, but its contents usually render into the window (in which case this returns true). - // This returns false for other layers, and when the document layer actually needs to paint into its backing store - // for some reason. - bool paintsIntoWindow() const; - // Returns true for a composited layer that has no backing store of its own, so // paints into some ancestor layer. bool paintsIntoCompositedAncestor() const { return !m_requiresOwnBackingStore; } diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp index 5f7b4ab..85dc6b4 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp @@ -1148,10 +1148,8 @@ void RenderLayerCompositor::frameViewDidScroll() // If there's a scrolling coordinator that manages scrolling for this frame view, // it will also manage updating the scroll layer position. if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) { - if (scrollingCoordinator->coordinatesScrollingForFrameView(frameView)) - return; if (Settings* settings = m_renderView->document()->settings()) { - if (settings->compositedScrollingForFramesEnabled()) + if (isMainFrame() || settings->compositedScrollingForFramesEnabled()) scrollingCoordinator->scrollableAreaScrollLayerDidChange(frameView); } } @@ -1515,7 +1513,6 @@ bool RenderLayerCompositor::requiresOwnBackingStore(const RenderLayer* layer, co RenderObject* renderer = layer->renderer(); if (compositingAncestorLayer && !(compositingAncestorLayer->backing()->graphicsLayer()->drawsContent() - || compositingAncestorLayer->backing()->paintsIntoWindow() || compositingAncestorLayer->backing()->paintsIntoCompositedAncestor())) return true; @@ -2492,7 +2489,6 @@ void RenderLayerCompositor::attachRootLayer(RootLayerAttachment attachment) } m_rootLayerAttachment = attachment; - rootLayerAttachmentChanged(); } void RenderLayerCompositor::detachRootLayer() @@ -2527,7 +2523,6 @@ void RenderLayerCompositor::detachRootLayer() } m_rootLayerAttachment = RootLayerUnattached; - rootLayerAttachmentChanged(); } void RenderLayerCompositor::updateRootLayerAttachment() @@ -2540,15 +2535,6 @@ bool RenderLayerCompositor::isMainFrame() const return !m_renderView->document()->ownerElement(); } -void RenderLayerCompositor::rootLayerAttachmentChanged() -{ - // The attachment can affect whether the RenderView layer's paintsIntoWindow() behavior, - // so call updateGraphicsLayerGeometry() to udpate that. - RenderLayer* layer = m_renderView->layer(); - if (RenderLayerBacking* backing = layer ? layer->backing() : 0) - backing->updateDrawsContent(); -} - // IFrames are special, because we hook compositing layers together across iframe boundaries // when both parent and iframe content are composited. So when this frame becomes composited, we have // to use a synthetic style change to get the iframes into RenderLayers in order to allow them to composite. diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.h b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.h index 15f73f5..f48f523 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.h +++ b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.h @@ -258,8 +258,6 @@ private: bool isMainFrame() const; - void rootLayerAttachmentChanged(); - void updateOverflowControlsLayers(); void notifyIFramesOfCompositingChange(); diff --git a/third_party/WebKit/Source/core/rendering/RenderObject.cpp b/third_party/WebKit/Source/core/rendering/RenderObject.cpp index 63a4936..0d0e706 100644 --- a/third_party/WebKit/Source/core/rendering/RenderObject.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderObject.cpp @@ -1363,7 +1363,7 @@ void RenderObject::repaintUsingContainer(const RenderLayerModelObject* repaintCo if (repaintContainer->isRenderView()) { ASSERT(repaintContainer == v); bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited(); - if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow()) { + if (!viewHasCompositedLayer) { LayoutRect repaintRectangle = r; if (viewHasCompositedLayer && v->layer()->transform()) repaintRectangle = enclosingIntRect(v->layer()->transform()->mapRect(r)); diff --git a/third_party/WebKit/Source/core/rendering/RenderView.cpp b/third_party/WebKit/Source/core/rendering/RenderView.cpp index 81b5595..ea77092 100644 --- a/third_party/WebKit/Source/core/rendering/RenderView.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderView.cpp @@ -434,10 +434,8 @@ void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&) } if (RenderLayer* compositingLayer = layer->enclosingCompositingLayerForRepaint()) { - if (!compositingLayer->backing()->paintsIntoWindow()) { - frameView()->setCannotBlitToWindow(); - break; - } + frameView()->setCannotBlitToWindow(); + break; } } diff --git a/third_party/WebKit/public/platform/WebContentLayer.h b/third_party/WebKit/public/platform/WebContentLayer.h index 36a23fc..0b13fa1 100644 --- a/third_party/WebKit/public/platform/WebContentLayer.h +++ b/third_party/WebKit/public/platform/WebContentLayer.h @@ -48,11 +48,6 @@ public: // to false. virtual void setAutomaticallyComputeRasterScale(bool) { } - // Set to render text in this layer with LCD antialiasing. Only set if you know that this layer will be - // drawn in a way where this makes sense - i.e. opaque background, not rotated or scaled, etc. - // Defaults to false; - virtual void setUseLCDText(bool) = 0; - // Set to draw a system-defined checkerboard if the compositor would otherwise draw a tile in this layer // and the actual contents are unavailable. If false, the compositor will draw the layer's background color // for these tiles. |