| Index: third_party/WebKit/LayoutTests/compositing/overflow/composited-scrolling-paint-phases-expected.txt
|
| 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 074f4b694099ff613d437d1b163efb3654f0a932..bbcea90104c05d8211ac52f089cc39b25f499604 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
|
| @@ -1,12 +1,5 @@
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| @@ -15,119 +8,109 @@
|
| "GraphicsLayerPaintBackground",
|
| "GraphicsLayerPaintForeground",
|
| "GraphicsLayerPaintMask"
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow HTML",
|
| - "bounds": [800, 242],
|
| - "drawsContent": true,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintMask"
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (relative positioned) DIV class='composited'",
|
| - "position": [29, 31],
|
| - "bounds": [80, 10],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#008000",
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow HTML (foreground) Layer",
|
| - "bounds": [800, 242],
|
| - "drawsContent": true,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintForeground"
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow DIV class='container'",
|
| - "position": [28, 20],
|
| - "bounds": [202, 202],
|
| - "shouldFlattenTransform": false,
|
| - "drawsContent": true,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintMask",
|
| - "GraphicsLayerPaintCompositedScroll"
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "Scrolling Layer",
|
| - "position": [1, 1],
|
| - "bounds": [185, 185],
|
| - "shouldFlattenTransform": false,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "Scrolling Contents Layer",
|
| - "bounds": [185, 715],
|
| - "drawsContent": true,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintOverflowContents",
|
| - "GraphicsLayerPaintCompositedScroll"
|
| - ]
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "Overflow Controls Host Layer",
|
| - "bounds": [202, 202],
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "Horizontal Scrollbar Layer",
|
| - "position": [1, 186],
|
| - "bounds": [185, 15],
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ]
|
| - },
|
| - {
|
| - "name": "Vertical Scrollbar Layer",
|
| - "position": [186, 1],
|
| - "bounds": [15, 185],
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ]
|
| - },
|
| - {
|
| - "name": "Scroll Corner Layer",
|
| - "position": [186, 186],
|
| - "bounds": [15, 15],
|
| - "drawsContent": true,
|
| - "paintingPhases": [
|
| - "GraphicsLayerPaintBackground",
|
| - "GraphicsLayerPaintForeground",
|
| - "GraphicsLayerPaintMask"
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow HTML",
|
| + "bounds": [800, 242],
|
| + "drawsContent": true,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (relative positioned) DIV class='composited'",
|
| + "position": [29, 31],
|
| + "bounds": [80, 10],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#008000",
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow HTML (foreground) Layer",
|
| + "bounds": [800, 242],
|
| + "drawsContent": true,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintForeground"
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow DIV class='container'",
|
| + "position": [28, 20],
|
| + "bounds": [202, 202],
|
| + "shouldFlattenTransform": false,
|
| + "drawsContent": true,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintMask",
|
| + "GraphicsLayerPaintCompositedScroll"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Scrolling Layer",
|
| + "position": [1, 1],
|
| + "bounds": [185, 185],
|
| + "shouldFlattenTransform": false,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Scrolling Contents Layer",
|
| + "bounds": [185, 715],
|
| + "drawsContent": true,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintOverflowContents",
|
| + "GraphicsLayerPaintCompositedScroll"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Overflow Controls Host Layer",
|
| + "bounds": [202, 202],
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Horizontal Scrollbar Layer",
|
| + "position": [1, 186],
|
| + "bounds": [185, 15],
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Vertical Scrollbar Layer",
|
| + "position": [186, 1],
|
| + "bounds": [15, 185],
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| + ]
|
| + },
|
| + {
|
| + "name": "Scroll Corner Layer",
|
| + "position": [186, 186],
|
| + "bounds": [15, 15],
|
| + "drawsContent": true,
|
| + "paintingPhases": [
|
| + "GraphicsLayerPaintBackground",
|
| + "GraphicsLayerPaintForeground",
|
| + "GraphicsLayerPaintMask"
|
| ]
|
| }
|
| ]
|
|
|