Auto-rebaseline for r182077

http://src.chromium.org/viewvc/blink?view=revision&revision=182077 BUG=390125 TBR=aberent@chromium.org Review URL: https://codereview.chromium.org/561273005 git-svn-id: svn://svn.chromium.org/blink/trunk@182103 bbb929c8-8fbe-4397-9dbb-9b2b20218538
author: wangxianzhu@chromium.org <wangxianzhu@chromium.org> 2014-09-16 21:28:44 +0000
committer: wangxianzhu@chromium.org <wangxianzhu@chromium.org> 2014-09-16 21:28:44 +0000
commit: 3c532da04bddcac2c394426cd299173f42b2c56b (patch)
tree: 607e656a73c66c02c99699d6d9643966c56c404d /third_party/WebKit/LayoutTests/platform
parent: c0021a54492fd5a27962d49d7f176b8ae59e4cbf (diff)
download: chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.zip
chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.gz
chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.bz2
184 files changed, 2438 insertions, 6 deletions
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-fixed-scrolling-expected.txt
new file mode 100644
index 0000000..5e610aa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 785x1016
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1016
+  RenderBlock {HTML} at (0,0) size 785x1016
+    RenderBody {BODY} at (8,8) size 769x1000
+      RenderBlock (anonymous) at (0,0) size 769x385
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,401) size 769x20
+        RenderText {#text} at (0,0) size 425x19
+          text run at (0,0) width 425: "The blue bar should be in front of the video, and at the top of the page."
+layer at (8,88) size 400x300
+  RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (0,50) size 500x60
+  RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
+scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-opacity-overlay-expected.txt
new file mode 100644
index 0000000..6efdb5e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/geometry/video-opacity-overlay-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x362
+  RenderBlock {HTML} at (0,0) size 800x362
+    RenderBody {BODY} at (8,16) size 784x338
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 279x19
+          text run at (0,0) width 279: "The orange bar should be in front of the video."
+layer at (8,52) size 402x302
+  RenderBlock (relative positioned) {DIV} at (0,36) size 402x302 [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (1,1) size 400x305
+      RenderText {#text} at (0,0) size 0x0
+layer at (9,53) size 400x300
+  RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,358) size 10x10 transparent
+  RenderBlock {DIV} at (1,306) size 10x10 [bgcolor=#008000]
+layer at (9,293) size 400x60
+  RenderBlock (positioned) {DIV} at (1,241) size 400x60 [bgcolor=#FFA500]
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/layers-inside-overflow-scroll-expected.txt
new file mode 100644
index 0000000..52be629
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/layers-inside-overflow-scroll-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x431
+  RenderBlock {HTML} at (0,0) size 800x431
+    RenderBody {BODY} at (8,16) size 784x405
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 412x19
+          text run at (0,0) width 412: "The red box in the overflow:scroll div should be scrolled out of view."
+      RenderBlock {DIV} at (10,36) size 302x207 [border: (1px solid #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (19,53) size 300x200
+  RenderVideo {VIDEO} at (1,1) size 300x200
+layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 100 scrollHeight 500
+  RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,1) size 285x500
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..032e667
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,16) size 784x20
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 447x19
+          text run at (0,0) width 447: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
+  RenderBlock (positioned) {DIV} at (8,52) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x105
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
+layer at (19,63) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,168) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..71a12c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (0,0) size 800x105
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x60
+      RenderText {#text} at (0,0) size 198x59
+        text run at (0,0) width 182: "The green box should obscure"
+        text run at (0,20) width 198: "the red box, and move when you"
+        text run at (0,40) width 109: "drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/reflections/load-video-in-reflection-expected.txt
new file mode 100644
index 0000000..43a04d8c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/reflections/load-video-in-reflection-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x353
+  RenderBlock {HTML} at (0,0) size 800x353
+    RenderBody {BODY} at (8,16) size 784x329
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 473x19
+          text run at (0,0) width 473: "You should see a reflected video below, rather than the red video background."
+layer at (8,52) size 300x293
+  RenderBlock {DIV} at (0,36) size 300x293
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,52) size 352x288
+  RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/self-painting-layers-expected.txt
new file mode 100644
index 0000000..47ea081
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/self-painting-layers-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x431
+  RenderBlock {HTML} at (0,0) size 800x431
+    RenderBody {BODY} at (8,16) size 784x405
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 309x19
+          text run at (0,0) width 309: "You should not see double text when the div scrolls"
+      RenderBlock {DIV} at (10,36) size 302x207 [border: (1px solid #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (19,53) size 300x200
+  RenderVideo {VIDEO} at (1,1) size 300x200
+layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 24 scrollHeight 500
+  RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,1) size 285x500
+      RenderText {#text} at (0,6) size 107x36
+        text run at (0,6) width 107: "Scrolled"
+      RenderBR {BR} at (107,6) size 0x36
+      RenderText {#text} at (0,54) size 47x36
+        text run at (0,54) width 47: "text"
+      RenderBR {BR} at (47,54) size 0x36
+      RenderText {#text} at (0,102) size 62x36
+        text run at (0,102) width 62: "here."
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/video-frame-size-change-expected.txt
new file mode 100644
index 0000000..f27bb6d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/video-frame-size-change-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x245
+  RenderBlock {HTML} at (0,0) size 800x245
+    RenderBody {BODY} at (8,16) size 784x221
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 458x19
+          text run at (0,0) width 458: "Tests decoding and rendering a video element that has a changing resolution."
+      RenderBlock (anonymous) at (0,36) size 784x185
+        RenderText {#text} at (320,165) size 4x19
+          text run at (320,165) width 4: " "
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,52) size 320x180
+  RenderVideo {VIDEO} at (0,0) size 320x180
+layer at (332,52) size 320x180
+  RenderVideo {VIDEO} at (324,0) size 320x180
diff --git a/third_party/WebKit/LayoutTests/platform/android/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/android/compositing/video/video-poster-expected.txt
new file mode 100644
index 0000000..ae7b4dc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/compositing/video/video-poster-expected.txt
@@ -0,0 +1,49 @@
+A <video> should not have a layer until playback begins.
+This test can not be run manually, it requires testRunner.layerTreeAsText.
+
+Case: No src, no poster
+{
+  "bounds": [800, 600],
+  "children": [
+    {
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    }
+  ]
+}
+
+
+Case: Displaying poster
+{
+  "bounds": [785, 605],
+  "children": [
+    {
+      "bounds": [785, 605],
+      "contentsOpaque": true,
+      "drawsContent": true
+    }
+  ]
+}
+
+
+Case: Displaying movie
+{
+  "bounds": [785, 813],
+  "children": [
+    {
+      "bounds": [785, 813],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "children": [
+        {
+          "position": [8, 8],
+          "bounds": [352, 288]
+        }
+      ]
+    }
+  ]
+}
+
+
+
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-expected.txt
new file mode 100644
index 0000000..8b9cd36
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x354
+  RenderBlock {HTML} at (0,0) size 800x354.44
+    RenderBody {BODY} at (8,18.72) size 784x327.72
+      RenderBlock {H3} at (0,0) size 784x23
+        RenderText {#text} at (0,0) size 92x22
+          text run at (0,0) width 92: "It passes if:"
+      RenderBlock {UL} at (0,41.72) size 784x40
+        RenderListItem {LI} at (40,0) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 389x19
+            text run at (0,0) width 389: "the video content has rounded corners (top left and bottom right)"
+        RenderListItem {LI} at (40,20) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 179x19
+            text run at (0,0) width 179: "gray background is not visible"
+      RenderBlock (anonymous) at (0,97.72) size 784x230
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,116) size 400x225
+  RenderVideo {VIDEO} at (0,0) size 400x225 [bgcolor=#808080]
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-ratio-expected.txt
new file mode 100644
index 0000000..99cc361
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-ratio-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x354
+  RenderBlock {HTML} at (0,0) size 800x354.44
+    RenderBody {BODY} at (8,18.72) size 784x327.72
+      RenderBlock {H3} at (0,0) size 784x23
+        RenderText {#text} at (0,0) size 92x22
+          text run at (0,0) width 92: "It passes if:"
+      RenderBlock {UL} at (0,41.72) size 784x40
+        RenderListItem {LI} at (40,0) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 389x19
+            text run at (0,0) width 389: "the video content has rounded corners (top left and bottom right)"
+        RenderListItem {LI} at (40,20) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 451x19
+            text run at (0,0) width 451: "the remaining space is gray and has same rounded corners as video content"
+      RenderBlock (anonymous) at (0,97.72) size 784x230
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,116) size 500x225
+  RenderVideo {VIDEO} at (0,0) size 500x225 [bgcolor=#808080]
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-shadow-expected.txt
new file mode 100644
index 0000000..281e7a9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/borders/border-radius-mask-video-shadow-expected.txt
@@ -0,0 +1,25 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x394
+  RenderBlock {HTML} at (0,0) size 800x394.44
+    RenderBody {BODY} at (8,18.72) size 784x367.72
+      RenderBlock {H3} at (0,0) size 784x23
+        RenderText {#text} at (0,0) size 92x22
+          text run at (0,0) width 92: "It passes if:"
+      RenderBlock {UL} at (0,41.72) size 784x60
+        RenderListItem {LI} at (40,0) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 389x19
+            text run at (0,0) width 389: "the video content has rounded corners (top left and bottom right)"
+        RenderListItem {LI} at (40,20) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 451x19
+            text run at (0,0) width 451: "the remaining space is gray and has same rounded corners as video content"
+        RenderListItem {LI} at (40,40) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 253x19
+            text run at (0,0) width 253: "has box shadow around the video element"
+      RenderBlock (anonymous) at (0,117.72) size 784x250
+        RenderText {#text} at (0,0) size 0x0
+layer at (18,146) size 500x225
+  RenderVideo {VIDEO} at (10,10) size 500x225 [bgcolor=#808080]
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt
new file mode 100644
index 0000000..1af74b7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 514x19
+          text run at (0,0) width 514: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
+      RenderBlock (anonymous) at (0,20) size 784x150
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,28) size 300x150
+  RenderVideo {VIDEO} at (0,0) size 300x150
+layer at (8,28) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (13,143) size 290x30
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 152x8
+      RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 164x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (249,0) size 35x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt
new file mode 100644
index 0000000..fb92653
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 291x19
+            text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=25066"
+        RenderBR {BR} at (291,15) size 0x0
+        RenderText {#text} at (0,20) size 396x19
+          text run at (0,20) width 396: "controls should not be misplaced when video gets a RenderLayer."
+      RenderBlock (anonymous) at (0,56) size 784x252
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (58,114) size 302x152 transparent
+  RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
+layer at (59,115) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (64,230) size 290x30
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 152x8
+      RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 164x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (249,0) size 35x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/replaced/border-radius-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/replaced/border-radius-clip-expected.txt
new file mode 100644
index 0000000..0cbb381
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/replaced/border-radius-clip-expected.txt
@@ -0,0 +1,35 @@
+layer at (0,0) size 785x958
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x934
+  RenderBlock {HTML} at (0,0) size 785x934
+    RenderBody {BODY} at (8,8) size 769x918
+      RenderText {#text} at (0,0) size 440x19
+        text run at (0,0) width 440: "All of the replaced elements below should be clipped to a border-radius. "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderImage {IMG} at (0,20) size 100x100
+      RenderText {#text} at (100,105) size 4x19
+        text run at (100,105) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderImage {INPUT} at (0,125) size 100x100
+      RenderText {#text} at (100,210) size 4x19
+        text run at (100,210) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (304,369) size 4x19
+        text run at (304,369) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (300,524) size 4x19
+        text run at (300,524) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,238) size 304x154
+  RenderPartObject {IFRAME} at (0,230) size 304x154 [border: (2px inset #EEEEEE)]
+    layer at (0,0) size 300x150
+      RenderView at (0,0) size 300x150
+    layer at (0,0) size 300x150
+      RenderBlock {HTML} at (0,0) size 300x150
+        RenderBody {BODY} at (0,0) size 300x150
+          RenderImage {IMG} at (0,0) size 100x100
+layer at (8,397) size 300x150
+  RenderVideo {VIDEO} at (0,389) size 300x150
+layer at (8,552) size 556x406
+  RenderEmbeddedObject {EMBED} at (0,544) size 556x406 [bgcolor=#00FF00] [border: (3px solid #000000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt
new file mode 100644
index 0000000..a1a5de7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 348x19
+          text run at (0,0) width 348: "Making sure the controller looks ok after a second load()."
+      RenderBlock (anonymous) at (0,36) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,249) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt
new file mode 100644
index 0000000..b705b57
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x305
+  RenderBlock {HTML} at (0,0) size 800x305
+    RenderBody {BODY} at (8,16) size 784x281
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 214x19
+          text run at (0,0) width 214: "Drawing the controls in strict mode."
+      RenderBlock (anonymous) at (0,36) size 784x245
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,52) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,52) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,257) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt
new file mode 100644
index 0000000..5a5205a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt
@@ -0,0 +1,56 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 260x19
+          text run at (0,0) width 260: "The look of the controls should not change."
+      RenderBlock {DIV} at (0,36) size 784x240 [color=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,276) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (18,44) size 320x240
+  RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (8,284) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (18,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (23,249) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
+layer at (8,284) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,489) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt
new file mode 100644
index 0000000..2bf40cd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt
@@ -0,0 +1,56 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x305
+  RenderBlock {HTML} at (0,0) size 800x305
+    RenderBody {BODY} at (8,16) size 784x281
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 444x19
+          text run at (0,0) width 444: "The look of the controls should not change when styled under strict mode."
+      RenderBlock (anonymous) at (0,36) size 784x245
+        RenderText {#text} at (320,225) size 4x19
+          text run at (320,225) width 4: " "
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,52) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240 [color=#FF0000]
+layer at (332,52) size 320x240
+  RenderVideo {VIDEO} at (324,0) size 320x240
+layer at (8,52) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,257) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
+layer at (332,52) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (337,257) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt
new file mode 100644
index 0000000..56299e4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 298x19
+          text run at (0,0) width 298: "The controls should not depend on preload value."
+      RenderBlock (anonymous) at (0,36) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,249) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/media-captions-no-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/media-captions-no-controls-expected.txt
new file mode 100644
index 0000000..67791fb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/media-captions-no-controls-expected.txt
@@ -0,0 +1,24 @@
+Tests that adding a text track does not make controls visible.
+
+EVENT(canplaythrough)
+
+** Initial state: no text tracks, controls should not be visible **
+EXPECTED (video.textTracks.length == '0') OK
+EXPECTED (video.controls == 'false') OK
+EXPECTED (internals.shadowRoot(video).firstChild == 'null') OK
+
+** Add a text track, controls should not become visible **
+RUN(video.addTextTrack('captions'))
+EXPECTED (video.textTracks.length == '1') OK
+EXPECTED (video.controls == 'false') OK
+EXPECTED (internals.shadowRoot(video).firstChild == 'null') OK
+
+** Enable controls **
+RUN(video.setAttribute('controls','controls'))
+EXPECTED (video.textTracks.length == '1') OK
+EXPECTED (video.controls == 'true') OK
+EXPECTED (internals.shadowRoot(video).firstChild != 'null') OK
+EXPECTED (panel.style['display'] != 'none') OK
+
+END OF TEST
+
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt
new file mode 100644
index 0000000..ca103ed
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt
@@ -0,0 +1,75 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x326
+  RenderBlock {HTML} at (0,0) size 800x326
+    RenderBody {BODY} at (8,8) size 784x310
+      RenderBlock {DIV} at (0,0) size 784x155
+      RenderBlock {DIV} at (0,155) size 784x155
+layer at (8,8) size 300x150
+  RenderVideo {VIDEO} at (0,0) size 300x150
+layer at (308,128) size 300x30
+  RenderMedia {AUDIO} at (300,120) size 300x30
+layer at (8,163) size 300x150
+  RenderVideo {VIDEO} at (0,0) size 300x150
+layer at (308,283) size 300x30
+  RenderMedia {AUDIO} at (300,120) size 300x30
+layer at (8,8) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (13,123) size 290x30
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 152x8
+      RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 164x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (249,0) size 35x30
+layer at (308,128) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
+    RenderBlock {DIV} at (0,0) size 300x30
+layer at (308,128) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 162x8
+      RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 174x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (259,0) size 35x30
+layer at (8,163) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (13,278) size 290x30
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 152x8
+      RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 164x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (249,0) size 35x30
+layer at (308,283) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
+    RenderBlock {DIV} at (0,0) size 300x30
+layer at (308,283) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 162x8
+      RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 174x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (259,0) size 35x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt
new file mode 100644
index 0000000..42413e1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt
@@ -0,0 +1,79 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x341
+  RenderBlock {HTML} at (0,0) size 800x341
+    RenderBody {BODY} at (8,8) size 784x325
+      RenderBlock (anonymous) at (0,0) size 784x245
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,245) size 784x80
+        RenderInline {SPAN} at (0,0) size 250x19
+          RenderText {#text} at (0,0) size 250x19
+            text run at (0,0) width 250: "Rendering horizontal line-positioned cues."
+          RenderBR {BR} at (250,0) size 0x19
+        RenderInline {SPAN} at (0,0) size 151x19
+          RenderText {#text} at (0,20) size 151x19
+            text run at (0,20) width 151: "EVENT(canplaythrough)"
+          RenderBR {BR} at (151,20) size 0x19
+        RenderInline {SPAN} at (0,0) size 103x19
+          RenderText {#text} at (0,40) size 103x19
+            text run at (0,40) width 103: "EVENT(seeked)"
+          RenderBR {BR} at (103,40) size 0x19
+        RenderInline {SPAN} at (0,0) size 97x19
+          RenderText {#text} at (0,60) size 97x19
+            text run at (0,60) width 97: "END OF TEST"
+          RenderBR {BR} at (97,60) size 0x19
+layer at (8,8) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,8) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,8) size 320x205
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+layer at (8,8) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,0) size 320x15
+    RenderInline {DIV} at (0,0) size 280x19 [bgcolor=#000000CC]
+      RenderText {#text} at (22,0) size 276x15
+        text run at (22,0) width 276: "Cue 1: should be positioned at the top of the video."
+layer at (8,27) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,19) size 320x15
+    RenderInline {DIV} at (0,0) size 308x19 [bgcolor=#000000CC]
+      RenderText {#text} at (8,0) size 304x15
+        text run at (8,0) width 304: "Cue 2: should be the second cue and not overlap cue 1."
+layer at (8,46) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,38) size 320x15
+    RenderInline {DIV} at (0,0) size 304x19 [bgcolor=#000000CC]
+      RenderText {#text} at (10,0) size 300x15
+        text run at (10,0) width 300: "Cue 3: should become the third line from top to bottom."
+layer at (8,103) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,95) size 320x15
+    RenderInline {DIV} at (0,0) size 294x19 [bgcolor=#000000CC]
+      RenderText {#text} at (15,0) size 290x15
+        text run at (15,0) width 290: "Cue 4: should be fixed positioned around the middle."
+layer at (8,194) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,186) size 320x15
+    RenderInline {DIV} at (0,0) size 296x19 [bgcolor=#000000CC]
+      RenderText {#text} at (14,0) size 292x15
+        text run at (14,0) width 292: "Cue 5: should be displayed at the bottom of the video."
+layer at (8,175) size 320x15 scrollHeight 17
+  RenderBlock (positioned) {DIV} at (0,167) size 320x15
+    RenderInline {DIV} at (0,0) size 286x19 [bgcolor=#000000CC]
+      RenderText {#text} at (19,0) size 282x15
+        text run at (19,0) width 282: "Cue 6: should be on top of bottom positioned cue 5."
+layer at (13,213) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 74x8
+      RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 86x24
+          RenderBlock {DIV} at (-4.77,0) size 32x24
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (171,0) size 35x30
+    RenderSlider {INPUT} at (212,11) size 15x8
+      RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 27x24
+          RenderBlock {DIV} at (-4,0) size 24x24
+    RenderButton {INPUT} at (237,0) size 30x30
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt
new file mode 100644
index 0000000..e48d9c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt
@@ -0,0 +1,79 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x341
+  RenderBlock {HTML} at (0,0) size 800x341
+    RenderBody {BODY} at (8,8) size 784x325
+      RenderBlock (anonymous) at (0,0) size 784x245
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,245) size 784x80
+        RenderInline {SPAN} at (0,0) size 349x19
+          RenderText {#text} at (0,0) size 349x19
+            text run at (0,0) width 349: "Rendering vertical line-positioned cues with Japanese text."
+          RenderBR {BR} at (349,0) size 0x19
+        RenderInline {SPAN} at (0,0) size 151x19
+          RenderText {#text} at (0,20) size 151x19
+            text run at (0,20) width 151: "EVENT(canplaythrough)"
+          RenderBR {BR} at (151,20) size 0x19
+        RenderInline {SPAN} at (0,0) size 103x19
+          RenderText {#text} at (0,40) size 103x19
+            text run at (0,40) width 103: "EVENT(seeked)"
+          RenderBR {BR} at (103,40) size 0x19
+        RenderInline {SPAN} at (0,0) size 97x19
+          RenderText {#text} at (0,60) size 97x19
+            text run at (0,60) width 97: "END OF TEST"
+          RenderBR {BR} at (97,60) size 0x19
+layer at (8,8) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,8) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,8) size 320x205
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+layer at (12,8) size 15x205 scrollX 2 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (4,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (31,8) size 15x205 scrollX 2 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (23,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (256,8) size 15x205 scrollX 2 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (248,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (237,8) size 15x205 scrollX 2 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (229,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (309,8) size 15x205 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (301,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (290,8) size 15x205 scrollWidth 17
+  RenderBlock (positioned) {DIV} at (282,0) size 15x205
+    RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+layer at (13,213) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 74x8
+      RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 86x24
+          RenderBlock {DIV} at (-0.28,0) size 32x24
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (171,0) size 35x30
+    RenderSlider {INPUT} at (212,11) size 15x8
+      RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 27x24
+          RenderBlock {DIV} at (-4,0) size 24x24
+    RenderButton {INPUT} at (237,0) size 30x30
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-aspect-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-aspect-ratio-expected.txt
new file mode 100644
index 0000000..d341259
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-aspect-ratio-expected.txt
@@ -0,0 +1,33 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 591x19
+          text run at (0,0) width 591: "Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size."
+      RenderBlock (anonymous) at (0,36) size 784x480
+        RenderBR {BR} at (320,240) size 0x0
+        RenderBlock {DIV} at (160,240) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderBlock {DIV} at (0,360) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,284) size 160x120
+  RenderVideo {VIDEO} at (0,240) size 160x120
+layer at (168,284) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,284) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,404) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (168,404) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (328,404) size 320x120
+  RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
+layer at (328,404) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (488,404) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-canvas-alpha-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-canvas-alpha-expected.txt
new file mode 100644
index 0000000..ff80dd0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-canvas-alpha-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (228,8) size 320x240
+  RenderHTMLCanvas {CANVAS} at (320,0) size 320x240
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv420-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv420-expected.txt
new file mode 100644
index 0000000..f8010e9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv420-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 318x19
+          text run at (0,0) width 318: "Test correct colorspace for yuv420, i.e. YU12 video"
+      RenderBlock (anonymous) at (0,36) size 784x156
+layer at (8,44) size 206x156
+  RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv422-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv422-expected.txt
new file mode 100644
index 0000000..90e8a58
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-colorspace-yuv422-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 318x19
+          text run at (0,0) width 318: "Test correct colorspace for yuv422, i.e. YU16 video"
+      RenderBlock (anonymous) at (0,36) size 784x156
+layer at (8,44) size 206x156
+  RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt
new file mode 100644
index 0000000..4db0f57
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt
@@ -0,0 +1,79 @@
+layer at (0,0) size 785x764
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x600
+  RenderBlock {HTML} at (0,0) size 785x600
+    RenderBody {BODY} at (8,8) size 769x584
+      RenderBlock {P} at (0,0) size 769x20
+        RenderText {#text} at (0,0) size 147x19
+          text run at (0,0) width 147: "Test controls placement."
+      RenderBlock {DIV} at (0,36) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,276) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,516) size 769x0
+layer at (8,44) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,284) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,249) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
+layer at (8,284) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,489) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
+layer at (8,524) size 320x240
+  RenderVideo {VIDEO} at (8,524) size 320x240
+layer at (8,524) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,729) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt
new file mode 100644
index 0000000..8af1137
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt
@@ -0,0 +1,31 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 471x19
+        text run at (0,0) width 471: "This tests that toggling the display property won't make the controls disappear."
+      RenderBR {BR} at (471,15) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,28) size 320x240
+  RenderVideo {VIDEO} at (0,20) size 320x240
+layer at (8,28) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (13,233) size 310x30
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 91.58x8
+      RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 103.58x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (154.58,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:06"
+    RenderButton {INPUT} at (188.58,0) size 35x30
+    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+      RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 43.42x24
+          RenderBlock {DIV} at (12.42,0) size 24x24
+    RenderButton {INPUT} at (271,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt
new file mode 100644
index 0000000..36414e0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 409x19
+          text run at (0,0) width 409: "Slider drawing with no source. The controls should render correctly."
+      RenderBlock (anonymous) at (0,36) size 784x152
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 302x152
+  RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
+layer at (9,45) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (14,160) size 290x30
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 152x8
+      RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 164x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:00"
+    RenderButton {INPUT} at (249,0) size 35x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-layer-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-layer-crash-expected.txt
new file mode 100644
index 0000000..7eeaf4f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-layer-crash-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 343x19
+          text run at (0,0) width 343: "Test dynamic removal of transformed and reflected video"
+      RenderBlock (anonymous) at (0,36) size 784x342
+        RenderText {#text} at (0,0) size 4x19
+          text run at (0,0) width 4: " "
+        RenderBR {BR} at (4,15) size 0x0
+        RenderText {#text} at (0,161) size 4x19
+          text run at (0,161) width 4: " "
+        RenderBR {BR} at (210,176) size 0x0
+        RenderText {#text} at (0,322) size 4x19
+          text run at (0,322) width 4: " "
+        RenderBR {BR} at (210,337) size 0x0
+layer at (12,64) size 206x156
+  RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,225) size 206x156
+  RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt
new file mode 100644
index 0000000..f1fd2d7ff
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt
@@ -0,0 +1,28 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 392x19
+          text run at (0,0) width 392: "Movie with no audio track. The volume button should not render."
+      RenderBlock (anonymous) at (0,36) size 784x288
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 352x288
+  RenderVideo {VIDEO} at (0,0) size 352x288
+layer at (8,44) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderBlock {DIV} at (0,253) size 352x35
+layer at (13,297) size 342x30
+  RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (9,0) size 30x30
+    RenderSlider {INPUT} at (48,11) size 170x8
+      RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 182x24
+          RenderBlock {DIV} at (-7,0) size 32x24
+    RenderFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 25x30
+        RenderText {#text} at (0,7) size 25x16
+          text run at (0,7) width 25: "0:09"
+    RenderButton {INPUT} at (267,0) size 35x30
+    RenderButton {INPUT} at (303,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-remove-insert-repaints-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-remove-insert-repaints-expected.txt
new file mode 100644
index 0000000..ea3a522
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-remove-insert-repaints-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-transformed-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-transformed-expected.txt
new file mode 100644
index 0000000..bf06a69
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-transformed-expected.txt
@@ -0,0 +1,24 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 205x19
+          text run at (0,0) width 205: "Test painting of transformed video"
+      RenderBlock (anonymous) at (0,36) size 784x483
+        RenderText {#text} at (0,141) size 4x19
+          text run at (0,141) width 4: " "
+        RenderBR {BR} at (210,156) size 0x0
+        RenderText {#text} at (0,302) size 4x19
+          text run at (0,302) width 4: " "
+        RenderBR {BR} at (210,317) size 0x0
+        RenderText {#text} at (0,463) size 4x19
+          text run at (0,463) width 4: " "
+        RenderBR {BR} at (210,478) size 0x0
+layer at (12,44) size 206x156
+  RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,205) size 206x156
+  RenderVideo {VIDEO} at (4,161) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,366) size 206x156
+  RenderVideo {VIDEO} at (4,322) size 206x156 [border: (3px solid #FF0000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt
new file mode 100644
index 0000000..24af02e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt
@@ -0,0 +1,52 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (12,12) size 776x543
+      RenderBlock {P} at (0,0) size 776x28
+        RenderText {#text} at (0,0) size 275x27
+          text run at (0,0) width 275: "Zoomed video with controls."
+layer at (57,85) size 240x180
+  RenderVideo {VIDEO} at (45,73) size 240x180
+layer at (57,85) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
+    RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (65,213) size 225x45 scrollWidth 329
+  RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (13.50,0) size 45x45
+    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+      RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-12) size 56.50x36
+          RenderBlock {DIV} at (-10.50,0) size 48x36
+    RenderFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 40x45
+        RenderText {#text} at (0,10) size 40x24
+          text run at (0,10) width 40: "0:00"
+    RenderButton {INPUT} at (185.50,0) size 52.50x45
+    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+      RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-12) size 41.50x36
+          RenderBlock {DIV} at (-5,0) size 36x36
+    RenderButton {INPUT} at (284.50,0) size 45x45
+layer at (57,310) size 240x180
+  RenderVideo {VIDEO} at (45,298) size 240x180
+layer at (57,310) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
+    RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (65,438) size 225x45 scrollWidth 329
+  RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (13.50,0) size 45x45
+    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+      RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-12) size 56.50x36
+          RenderBlock {DIV} at (-10.50,0) size 48x36
+    RenderFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 40x45
+        RenderText {#text} at (0,10) size 40x24
+          text run at (0,10) width 40: "0:00"
+    RenderButton {INPUT} at (185.50,0) size 52.50x45
+    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+      RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-12) size 41.50x36
+          RenderBlock {DIV} at (-5,0) size 36x36
+    RenderButton {INPUT} at (284.50,0) size 45x45
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-expected.txt
new file mode 100644
index 0000000..7c9d6efb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 785x850
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x850
+  RenderBlock {HTML} at (0,0) size 785x850
+    RenderBody {BODY} at (8,8) size 769x834
+      RenderBlock {P} at (0,0) size 769x20
+        RenderText {#text} at (0,0) size 268x19
+          text run at (0,0) width 268: "150% zoom, with width and height attributes"
+      RenderBlock (anonymous) at (0,36) size 769x373
+        RenderText {#text} at (0,353) size 4x19
+          text run at (0,353) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+      RenderBlock {P} at (0,425) size 769x20
+        RenderText {#text} at (0,0) size 287x19
+          text run at (0,0) width 287: "150% zoom, without width and height attributes"
+      RenderBlock (anonymous) at (0,461) size 769x373
+        RenderText {#text} at (0,353) size 4x19
+          text run at (0,353) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+layer at (12,44) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (12,469) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
diff --git a/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..032e667
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,16) size 784x20
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 447x19
+          text run at (0,0) width 447: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
+  RenderBlock (positioned) {DIV} at (8,52) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x105
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
+layer at (19,63) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,168) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..71a12c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/android/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (0,0) size 800x105
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x60
+      RenderText {#text} at (0,0) size 198x59
+        text run at (0,0) width 182: "The green box should obscure"
+        text run at (0,20) width 198: "the red box, and move when you"
+        text run at (0,40) width 109: "drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.txt
index 5e610aa..e1d7f53 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -10,6 +10,11 @@ layer at (0,0) size 785x1016
           text run at (0,0) width 425: "The blue bar should be in front of the video, and at the top of the page."
 layer at (8,88) size 400x300
   RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (8,88) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (8,88) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (0,50) size 500x60
   RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
 scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.txt
index 6efdb5e..c1699da 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.txt
@@ -12,6 +12,11 @@ layer at (8,52) size 402x302
       RenderText {#text} at (0,0) size 0x0
 layer at (9,53) size 400x300
   RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,53) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (9,53) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (9,358) size 10x10 transparent
   RenderBlock {DIV} at (1,306) size 10x10 [bgcolor=#008000]
 layer at (9,293) size 400x60
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/layers-inside-overflow-scroll-expected.txt
index 52be629..2d8b6b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/layers-inside-overflow-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/layers-inside-overflow-scroll-expected.txt
@@ -13,3 +13,8 @@ layer at (19,53) size 300x200
 layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 100 scrollHeight 500
   RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
     RenderBlock {DIV} at (1,1) size 285x500
+layer at (19,53) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,53) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/overflow-compositing-descendant-expected.txt
index 032e667..a5b5ab0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -13,5 +13,10 @@ layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
     RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
 layer at (19,63) size 100x100
   RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,63) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,63) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
 layer at (19,168) size 100x100
   RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scroll-ancestor-update-expected.txt
index 71a12c6..3c8d443 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -20,3 +20,8 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeig
     RenderBlock {DIV} at (1,51) size 185x500
 layer at (51,51) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/load-video-in-reflection-expected.txt
index 43a04d8c..de0dd52 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/load-video-in-reflection-expected.txt
@@ -11,3 +11,8 @@ layer at (8,52) size 300x293
     RenderText {#text} at (0,0) size 0x0
 layer at (8,52) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
+layer at (8,52) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,52) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/self-painting-layers-expected.txt
index 47ea081..6b81571 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/self-painting-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/self-painting-layers-expected.txt
@@ -21,3 +21,8 @@ layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 24 scrollHe
       RenderBR {BR} at (47,54) size 0x36
       RenderText {#text} at (0,102) size 62x36
         text run at (0,102) width 62: "here."
+layer at (19,53) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,53) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/video-frame-size-change-expected.txt
index f27bb6d..aa6ab49 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/video-frame-size-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/video-frame-size-change-expected.txt
@@ -15,3 +15,13 @@ layer at (8,52) size 320x180
   RenderVideo {VIDEO} at (0,0) size 320x180
 layer at (332,52) size 320x180
   RenderVideo {VIDEO} at (324,0) size 320x180
+layer at (8,52) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (8,52) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
+layer at (332,52) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (332,52) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-poster-expected.txt
index ae7b4dc..99c2f05 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-poster-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-poster-expected.txt
@@ -37,8 +37,17 @@ Case: Displaying movie
       "drawsContent": true,
       "children": [
         {
-          "position": [8, 8],
-          "bounds": [352, 288]
+          "children": [
+            {
+              "position": [8, 8],
+              "bounds": [352, 288]
+            },
+            {
+              "position": [8, 8],
+              "bounds": [352, 288],
+              "drawsContent": true
+            }
+          ]
         }
       ]
     }
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.txt
index 8b9cd36..3ca3016 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x354
         RenderText {#text} at (0,0) size 0x0
 layer at (8,116) size 400x225
   RenderVideo {VIDEO} at (0,0) size 400x225 [bgcolor=#808080]
+layer at (8,116) size 400x225
+  RenderFlexibleBox {DIV} at (0,0) size 400x225
+    RenderBlock {DIV} at (0,190) size 400x35
+layer at (8,116) size 400x190
+  RenderFlexibleBox {DIV} at (0,0) size 400x190
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.txt
index 99cc361..d6e86f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x354
         RenderText {#text} at (0,0) size 0x0
 layer at (8,116) size 500x225
   RenderVideo {VIDEO} at (0,0) size 500x225 [bgcolor=#808080]
+layer at (8,116) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (8,116) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.txt
index 281e7a9..fd512dd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.txt
@@ -23,3 +23,8 @@ layer at (0,0) size 800x394
         RenderText {#text} at (0,0) size 0x0
 layer at (18,146) size 500x225
   RenderVideo {VIDEO} at (10,10) size 500x225 [bgcolor=#808080]
+layer at (18,146) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (18,146) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
index 1af74b7..97d1cc6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -13,6 +13,8 @@ layer at (8,28) size 300x150
 layer at (8,28) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,28) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
index fb92653..32d3d65 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
@@ -18,6 +18,8 @@ layer at (58,114) size 302x152 transparent
 layer at (59,115) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (59,115) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (64,230) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.txt
index 0cbb381..b04c929 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.txt
@@ -33,3 +33,8 @@ layer at (8,397) size 300x150
   RenderVideo {VIDEO} at (0,389) size 300x150
 layer at (8,552) size 556x406
   RenderEmbeddedObject {EMBED} at (0,544) size 556x406 [bgcolor=#00FF00] [border: (3px solid #000000)]
+layer at (8,397) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,397) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
index a1a5de7..f5e2cd4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
index b705b57..b9d1424 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
@@ -13,6 +13,8 @@ layer at (8,52) size 320x240
 layer at (8,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
index 5a5205a..82593f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
@@ -17,6 +17,8 @@ layer at (8,284) size 320x240
 layer at (18,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (18,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (23,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (23,249) size 310x30
 layer at (8,284) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,284) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
index 2bf40cd..3339f24 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
@@ -17,6 +17,8 @@ layer at (332,52) size 320x240
 layer at (8,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (13,257) size 310x30
 layer at (332,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (332,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (337,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
index 56299e4..34bf3bf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
index ca103ed..14a937e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
@@ -16,6 +16,8 @@ layer at (308,283) size 300x30
 layer at (8,8) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,8) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -46,6 +48,8 @@ layer at (308,128) size 300x30
 layer at (8,163) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,163) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,278) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
index 42413e1..16e3f31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,0) size 320x15
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
index e48d9c6..342e126 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (12,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (4,0) size 15x205
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.txt
index d341259..f63ed16 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.txt
@@ -25,9 +25,49 @@ layer at (8,404) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
 layer at (168,404) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (328,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (8,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (328,404) size 320x120
   RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
 layer at (328,404) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (488,404) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (488,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (488,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv420-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv420-expected.txt
index f8010e9..7fcde0e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv420-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv420-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,36) size 784x156
 layer at (8,44) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv422-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv422-expected.txt
index 90e8a58..5bacc3b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv422-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-colorspace-yuv422-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,36) size 784x156
 layer at (8,44) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
index 4db0f57..be68bfc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
@@ -18,6 +18,8 @@ layer at (8,284) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -38,6 +40,8 @@ layer at (13,249) size 310x30
 layer at (8,284) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,284) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -60,6 +64,8 @@ layer at (8,524) size 320x240
 layer at (8,524) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,524) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,729) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
index 8af1137..37865fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
@@ -12,6 +12,8 @@ layer at (8,28) size 320x240
 layer at (8,28) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,28) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,233) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
index 36414e0..0384a7b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 302x152
 layer at (9,45) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (9,45) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (14,160) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.txt
index 7eeaf4f..9eebcec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.txt
@@ -18,5 +18,15 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,337) size 0x0
 layer at (12,64) size 206x156
   RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,67) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,67) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,225) size 206x156
   RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,228) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,228) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
index f1fd2d7ff..fcae4ee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 352x288
 layer at (8,44) size 352x288
   RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,44) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
 layer at (13,297) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-transformed-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-transformed-expected.txt
index bf06a69..51e6af5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-transformed-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-transformed-expected.txt
@@ -18,7 +18,22 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,478) size 0x0
 layer at (12,44) size 206x156
   RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,205) size 206x156
   RenderVideo {VIDEO} at (4,161) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,208) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,208) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,366) size 206x156
   RenderVideo {VIDEO} at (4,322) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,369) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,369) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
index 24af02e..48420c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
@@ -11,6 +11,8 @@ layer at (57,85) size 240x180
 layer at (57,85) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,85) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,213) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
@@ -33,6 +35,8 @@ layer at (57,310) size 240x180
 layer at (57,310) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,310) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,438) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.txt
index 7c9d6efb..cfcf785 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.txt
@@ -21,3 +21,13 @@ layer at (12,44) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
 layer at (12,469) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (16,48) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,48) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
+layer at (16,473) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,473) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
index 032e667..a5b5ab0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -13,5 +13,10 @@ layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
     RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
 layer at (19,63) size 100x100
   RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,63) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,63) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
 layer at (19,168) size 100x100
   RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
index 71a12c6..3c8d443 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -20,3 +20,8 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeig
     RenderBlock {DIV} at (1,51) size 185x500
 layer at (51,51) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/mac-lion/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-lion/media/track/track-cue-rendering-vertical-expected.txt
index 9f63fda..46af1b3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-lion/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-lion/media/track/track-cue-rendering-vertical-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 18x205
   RenderBlock (positioned) {DIV} at (0,0) size 18x205
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.txt
new file mode 100644
index 0000000..0bb4271
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 785x1016
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1016
+  RenderBlock {HTML} at (0,0) size 785x1016
+    RenderBody {BODY} at (8,8) size 769x1000
+      RenderBlock (anonymous) at (0,0) size 769x384
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,400) size 769x18
+        RenderText {#text} at (0,0) size 445x18
+          text run at (0,0) width 445: "The blue bar should be in front of the video, and at the top of the page."
+layer at (8,88) size 400x300
+  RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (8,88) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (8,88) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
+layer at (0,50) size 500x60
+  RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
+scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
index 35d2c45..16b707e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
@@ -12,6 +12,11 @@ layer at (8,50) size 402x302
       RenderText {#text} at (0,0) size 0x0
 layer at (9,51) size 400x300
   RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,51) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (9,51) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (9,355) size 10x10 transparent
   RenderBlock {DIV} at (1,305) size 10x10 [bgcolor=#008000]
 layer at (9,291) size 400x60
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/layers-inside-overflow-scroll-expected.txt
new file mode 100644
index 0000000..5f19f23
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/layers-inside-overflow-scroll-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x428
+  RenderBlock {HTML} at (0,0) size 800x428
+    RenderBody {BODY} at (8,16) size 784x402
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 437x18
+          text run at (0,0) width 437: "The red box in the overflow:scroll div should be scrolled out of view."
+      RenderBlock {DIV} at (10,34) size 302x206 [border: (1px solid #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (19,51) size 300x200
+  RenderVideo {VIDEO} at (1,1) size 300x200
+layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 100 scrollHeight 500
+  RenderBlock {DIV} at (10,250) size 302x152 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,1) size 285x500
+layer at (19,51) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..af2cceb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 467x18
+          text run at (0,0) width 467: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
+  RenderBlock (positioned) {DIV} at (8,50) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x104
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
+layer at (19,61) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,61) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,61) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
+layer at (19,165) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..c3561f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x104
+  RenderBlock {HTML} at (0,0) size 800x104
+    RenderBody {BODY} at (0,0) size 800x104
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x54
+      RenderText {#text} at (0,0) size 191x54
+        text run at (0,0) width 191: "The green box should obscure"
+        text run at (0,18) width 180: "the red box, and move when"
+        text run at (0,36) width 141: "you drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
new file mode 100644
index 0000000..cdc657f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x350
+  RenderBlock {HTML} at (0,0) size 800x350
+    RenderBody {BODY} at (8,16) size 784x326
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 493x18
+          text run at (0,0) width 493: "You should see a reflected video below, rather than the red video background."
+layer at (8,50) size 300x292
+  RenderBlock {DIV} at (0,34) size 300x292
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,50) size 352x288
+  RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
+layer at (8,50) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,50) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/self-painting-layers-expected.txt
new file mode 100644
index 0000000..b80fa47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/self-painting-layers-expected.txt
@@ -0,0 +1,28 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x428
+  RenderBlock {HTML} at (0,0) size 800x428
+    RenderBody {BODY} at (8,16) size 784x402
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 326x18
+          text run at (0,0) width 326: "You should not see double text when the div scrolls"
+      RenderBlock {DIV} at (10,34) size 302x206 [border: (1px solid #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (19,51) size 300x200
+  RenderVideo {VIDEO} at (1,1) size 300x200
+layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 24 scrollHeight 500
+  RenderBlock {DIV} at (10,250) size 302x152 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,1) size 285x500
+      RenderText {#text} at (0,5) size 107x37
+        text run at (0,5) width 107: "Scrolled"
+      RenderBR {BR} at (107,5) size 0x37
+      RenderText {#text} at (0,53) size 48x37
+        text run at (0,53) width 48: "text"
+      RenderBR {BR} at (48,53) size 0x37
+      RenderText {#text} at (0,101) size 63x37
+        text run at (0,101) width 63: "here."
+layer at (19,51) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/video-frame-size-change-expected.txt
index 36efe66..3552c70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/video-frame-size-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/video-frame-size-change-expected.txt
@@ -15,3 +15,13 @@ layer at (8,50) size 320x180
   RenderVideo {VIDEO} at (0,0) size 320x180
 layer at (332,50) size 320x180
   RenderVideo {VIDEO} at (324,0) size 320x180
+layer at (8,50) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (8,50) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
+layer at (332,50) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (332,50) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/compositing/video/video-poster-expected.txt
new file mode 100644
index 0000000..bcff28b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/video/video-poster-expected.txt
@@ -0,0 +1,58 @@
+A <video> should not have a layer until playback begins.
+This test can not be run manually, it requires testRunner.layerTreeAsText.
+
+Case: No src, no poster
+{
+  "bounds": [800, 600],
+  "children": [
+    {
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    }
+  ]
+}
+
+
+Case: Displaying poster
+{
+  "bounds": [800, 600],
+  "children": [
+    {
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    }
+  ]
+}
+
+
+Case: Displaying movie
+{
+  "bounds": [785, 782],
+  "children": [
+    {
+      "bounds": [785, 782],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "children": [
+        {
+          "children": [
+            {
+              "position": [8, 8],
+              "bounds": [352, 288]
+            },
+            {
+              "position": [8, 8],
+              "bounds": [352, 288],
+              "drawsContent": true
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+
+
+
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.txt
index 96cc0a6..0810432 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x348
         RenderText {#text} at (0,0) size 0x0
 layer at (8,111) size 400x225
   RenderVideo {VIDEO} at (0,0) size 400x225 [bgcolor=#808080]
+layer at (8,111) size 400x225
+  RenderFlexibleBox {DIV} at (0,0) size 400x225
+    RenderBlock {DIV} at (0,190) size 400x35
+layer at (8,111) size 400x190
+  RenderFlexibleBox {DIV} at (0,0) size 400x190
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.txt
index 3f4e3c0..a41adbf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x348
         RenderText {#text} at (0,0) size 0x0
 layer at (8,111) size 500x225
   RenderVideo {VIDEO} at (0,0) size 500x225 [bgcolor=#808080]
+layer at (8,111) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (8,111) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.txt
index bd1d8b2..d957fe3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.txt
@@ -23,3 +23,8 @@ layer at (0,0) size 800x386
         RenderText {#text} at (0,0) size 0x0
 layer at (18,139) size 500x225
   RenderVideo {VIDEO} at (10,10) size 500x225 [bgcolor=#808080]
+layer at (18,139) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (18,139) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
index d0300a3..659fa0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -13,6 +13,8 @@ layer at (8,26) size 300x150
 layer at (8,26) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,26) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,141) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
index da7f8ea..0817df2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
@@ -18,6 +18,8 @@ layer at (58,110) size 302x152 transparent
 layer at (59,111) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (59,111) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (64,226) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.txt
index cb202ba..b7ce47b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.txt
@@ -33,3 +33,8 @@ layer at (8,392) size 300x150
   RenderVideo {VIDEO} at (0,384) size 300x150
 layer at (8,546) size 556x406
   RenderEmbeddedObject {EMBED} at (0,538) size 556x406 [bgcolor=#00FF00] [border: (3px solid #000000)]
+layer at (8,392) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,392) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
index 7ea53cb..664f5ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
index 1bd2eeb..4e60717 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
@@ -13,6 +13,8 @@ layer at (8,50) size 320x240
 layer at (8,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
index 5686f62..c894538 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
@@ -17,6 +17,8 @@ layer at (8,282) size 320x240
 layer at (18,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (18,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (23,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (23,247) size 310x30
 layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,282) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
index bc257ba..1396970 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
@@ -17,6 +17,8 @@ layer at (332,50) size 320x240
 layer at (8,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (13,255) size 310x30
 layer at (332,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (332,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (337,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
index a6be0e9..4e6d9ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
index a786d39..8c77ee0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
@@ -16,6 +16,8 @@ layer at (308,282) size 300x30
 layer at (8,8) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,8) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -46,6 +48,8 @@ layer at (308,128) size 300x30
 layer at (8,162) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,162) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,277) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
index efff876..57e8366 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 320x14 scrollHeight 16
   RenderBlock (positioned) {DIV} at (0,0) size 320x14
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
index a77b7b4..8fc84f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 18x205
   RenderBlock (positioned) {DIV} at (0,0) size 18x205
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-aspect-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-aspect-ratio-expected.txt
new file mode 100644
index 0000000..7a1ee51
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-aspect-ratio-expected.txt
@@ -0,0 +1,73 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 623x18
+          text run at (0,0) width 623: "Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size."
+      RenderBlock (anonymous) at (0,34) size 784x480
+        RenderBR {BR} at (320,240) size 0x0
+        RenderBlock {DIV} at (160,240) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderBlock {DIV} at (0,360) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,282) size 160x120
+  RenderVideo {VIDEO} at (0,240) size 160x120
+layer at (168,282) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,282) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,402) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (168,402) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (328,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (8,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (328,402) size 320x120
+  RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
+layer at (328,402) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (488,402) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (488,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (488,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv420-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv420-expected.txt
index e295562..0fb15c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv420-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv420-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,34) size 784x156
 layer at (8,42) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv422-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv422-expected.txt
index 03deeb7..f8059b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv422-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-colorspace-yuv422-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,34) size 784x156
 layer at (8,42) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
index 593732e..258e7d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
@@ -18,6 +18,8 @@ layer at (8,282) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -38,6 +40,8 @@ layer at (13,247) size 310x30
 layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,282) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -60,6 +64,8 @@ layer at (8,522) size 320x240
 layer at (8,522) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,522) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,727) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
index c1498b1..0ae3519 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
@@ -12,6 +12,8 @@ layer at (8,26) size 320x240
 layer at (8,26) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,26) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,231) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
index 0ac3572..31430657 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 302x152
 layer at (9,43) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (9,43) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (14,158) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-layer-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-layer-crash-expected.txt
new file mode 100644
index 0000000..fe58491
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-layer-crash-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 360x18
+          text run at (0,0) width 360: "Test dynamic removal of transformed and reflected video"
+      RenderBlock (anonymous) at (0,34) size 784x338
+        RenderText {#text} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
+        RenderBR {BR} at (4,14) size 0x0
+        RenderText {#text} at (0,160) size 4x18
+          text run at (0,160) width 4: " "
+        RenderBR {BR} at (210,174) size 0x0
+        RenderText {#text} at (0,320) size 4x18
+          text run at (0,320) width 4: " "
+        RenderBR {BR} at (210,334) size 0x0
+layer at (12,60) size 206x156
+  RenderVideo {VIDEO} at (4,18) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,63) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,63) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
+layer at (12,220) size 206x156
+  RenderVideo {VIDEO} at (4,178) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,223) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,223) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
index ba9ae46..146fc14 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 352x288
 layer at (8,42) size 352x288
   RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,42) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
 layer at (13,295) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-transformed-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-transformed-expected.txt
new file mode 100644
index 0000000..91e0d3e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-transformed-expected.txt
@@ -0,0 +1,39 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 217x18
+          text run at (0,0) width 217: "Test painting of transformed video"
+      RenderBlock (anonymous) at (0,34) size 784x480
+        RenderText {#text} at (0,142) size 4x18
+          text run at (0,142) width 4: " "
+        RenderBR {BR} at (210,156) size 0x0
+        RenderText {#text} at (0,302) size 4x18
+          text run at (0,302) width 4: " "
+        RenderBR {BR} at (210,316) size 0x0
+        RenderText {#text} at (0,462) size 4x18
+          text run at (0,462) width 4: " "
+        RenderBR {BR} at (210,476) size 0x0
+layer at (12,42) size 206x156
+  RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
+layer at (12,202) size 206x156
+  RenderVideo {VIDEO} at (4,160) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,205) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,205) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
+layer at (12,362) size 206x156
+  RenderVideo {VIDEO} at (4,320) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,365) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,365) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
index 80b4a7d..0514fab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
@@ -11,6 +11,8 @@ layer at (57,85) size 240x180
 layer at (57,85) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,85) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,213) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
@@ -33,6 +35,8 @@ layer at (57,310) size 240x180
 layer at (57,310) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,310) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,438) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-expected.txt
new file mode 100644
index 0000000..cbff937
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-expected.txt
@@ -0,0 +1,33 @@
+layer at (0,0) size 785x844
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x844
+  RenderBlock {HTML} at (0,0) size 785x844
+    RenderBody {BODY} at (8,8) size 769x828
+      RenderBlock {P} at (0,0) size 769x18
+        RenderText {#text} at (0,0) size 283x18
+          text run at (0,0) width 283: "150% zoom, with width and height attributes"
+      RenderBlock (anonymous) at (0,34) size 769x372
+        RenderText {#text} at (0,354) size 4x18
+          text run at (0,354) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+      RenderBlock {P} at (0,422) size 769x18
+        RenderText {#text} at (0,0) size 303x18
+          text run at (0,0) width 303: "150% zoom, without width and height attributes"
+      RenderBlock (anonymous) at (0,456) size 769x372
+        RenderText {#text} at (0,354) size 4x18
+          text run at (0,354) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+layer at (12,42) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (12,464) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (16,46) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,46) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
+layer at (16,468) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,468) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..af2cceb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 467x18
+          text run at (0,0) width 467: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
+  RenderBlock (positioned) {DIV} at (8,50) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x104
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
+layer at (19,61) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,61) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,61) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
+layer at (19,165) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..c3561f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x104
+  RenderBlock {HTML} at (0,0) size 800x104
+    RenderBody {BODY} at (0,0) size 800x104
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x54
+      RenderText {#text} at (0,0) size 191x54
+        text run at (0,0) width 191: "The green box should obscure"
+        text run at (0,18) width 180: "the red box, and move when"
+        text run at (0,36) width 141: "you drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-fixed-scrolling-expected.txt
index 5e610aa..e1d7f53 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-fixed-scrolling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -10,6 +10,11 @@ layer at (0,0) size 785x1016
           text run at (0,0) width 425: "The blue bar should be in front of the video, and at the top of the page."
 layer at (8,88) size 400x300
   RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (8,88) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (8,88) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (0,50) size 500x60
   RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
 scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-opacity-overlay-expected.txt
index 6efdb5e..c1699da 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/geometry/video-opacity-overlay-expected.txt
@@ -12,6 +12,11 @@ layer at (8,52) size 402x302
       RenderText {#text} at (0,0) size 0x0
 layer at (9,53) size 400x300
   RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,53) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (9,53) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (9,358) size 10x10 transparent
   RenderBlock {DIV} at (1,306) size 10x10 [bgcolor=#008000]
 layer at (9,293) size 400x60
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/layers-inside-overflow-scroll-expected.txt
index 52be629..2d8b6b9 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/layers-inside-overflow-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/layers-inside-overflow-scroll-expected.txt
@@ -13,3 +13,8 @@ layer at (19,53) size 300x200
 layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 100 scrollHeight 500
   RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
     RenderBlock {DIV} at (1,1) size 285x500
+layer at (19,53) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,53) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/overflow-compositing-descendant-expected.txt
index 032e667..a5b5ab0 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -13,5 +13,10 @@ layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
     RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
 layer at (19,63) size 100x100
   RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,63) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,63) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
 layer at (19,168) size 100x100
   RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/scroll-ancestor-update-expected.txt
index 71a12c6..3c8d443 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -20,3 +20,8 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeig
     RenderBlock {DIV} at (1,51) size 185x500
 layer at (51,51) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/reflections/load-video-in-reflection-expected.txt
index 43a04d8c..de0dd52 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/reflections/load-video-in-reflection-expected.txt
@@ -11,3 +11,8 @@ layer at (8,52) size 300x293
     RenderText {#text} at (0,0) size 0x0
 layer at (8,52) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
+layer at (8,52) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,52) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/self-painting-layers-expected.txt
index 47ea081..6b81571 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/self-painting-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/self-painting-layers-expected.txt
@@ -21,3 +21,8 @@ layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 24 scrollHe
       RenderBR {BR} at (47,54) size 0x36
       RenderText {#text} at (0,102) size 62x36
         text run at (0,102) width 62: "here."
+layer at (19,53) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,53) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video-frame-size-change-expected.txt
index f27bb6d..aa6ab49 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video-frame-size-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video-frame-size-change-expected.txt
@@ -15,3 +15,13 @@ layer at (8,52) size 320x180
   RenderVideo {VIDEO} at (0,0) size 320x180
 layer at (332,52) size 320x180
   RenderVideo {VIDEO} at (324,0) size 320x180
+layer at (8,52) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (8,52) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
+layer at (332,52) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (332,52) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video/video-poster-expected.txt
index ae7b4dc..99c2f05 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video/video-poster-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/compositing/video/video-poster-expected.txt
@@ -37,8 +37,17 @@ Case: Displaying movie
       "drawsContent": true,
       "children": [
         {
-          "position": [8, 8],
-          "bounds": [352, 288]
+          "children": [
+            {
+              "position": [8, 8],
+              "bounds": [352, 288]
+            },
+            {
+              "position": [8, 8],
+              "bounds": [352, 288],
+              "drawsContent": true
+            }
+          ]
         }
       ]
     }
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-expected.txt
index 8b9cd36..3ca3016 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x354
         RenderText {#text} at (0,0) size 0x0
 layer at (8,116) size 400x225
   RenderVideo {VIDEO} at (0,0) size 400x225 [bgcolor=#808080]
+layer at (8,116) size 400x225
+  RenderFlexibleBox {DIV} at (0,0) size 400x225
+    RenderBlock {DIV} at (0,190) size 400x35
+layer at (8,116) size 400x190
+  RenderFlexibleBox {DIV} at (0,0) size 400x190
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-ratio-expected.txt
index 99cc361..d6e86f4 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-ratio-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x354
         RenderText {#text} at (0,0) size 0x0
 layer at (8,116) size 500x225
   RenderVideo {VIDEO} at (0,0) size 500x225 [bgcolor=#808080]
+layer at (8,116) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (8,116) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-shadow-expected.txt
index 281e7a9..fd512dd 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/borders/border-radius-mask-video-shadow-expected.txt
@@ -23,3 +23,8 @@ layer at (0,0) size 800x394
         RenderText {#text} at (0,0) size 0x0
 layer at (18,146) size 500x225
   RenderVideo {VIDEO} at (10,10) size 500x225 [bgcolor=#808080]
+layer at (18,146) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (18,146) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
index 1af74b7..97d1cc6 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -13,6 +13,8 @@ layer at (8,28) size 300x150
 layer at (8,28) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,28) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
index fb92653..32d3d65 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
@@ -18,6 +18,8 @@ layer at (58,114) size 302x152 transparent
 layer at (59,115) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (59,115) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (64,230) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/replaced/border-radius-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/replaced/border-radius-clip-expected.txt
index 0cbb381..b04c929 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/replaced/border-radius-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/replaced/border-radius-clip-expected.txt
@@ -33,3 +33,8 @@ layer at (8,397) size 300x150
   RenderVideo {VIDEO} at (0,389) size 300x150
 layer at (8,552) size 556x406
   RenderEmbeddedObject {EMBED} at (0,544) size 556x406 [bgcolor=#00FF00] [border: (3px solid #000000)]
+layer at (8,397) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,397) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
index a1a5de7..f5e2cd4 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
index b705b57..b9d1424 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
@@ -13,6 +13,8 @@ layer at (8,52) size 320x240
 layer at (8,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
index 5a5205a..82593f4 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
@@ -17,6 +17,8 @@ layer at (8,284) size 320x240
 layer at (18,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (18,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (23,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (23,249) size 310x30
 layer at (8,284) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,284) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
index 2bf40cd..3339f24 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
@@ -17,6 +17,8 @@ layer at (332,52) size 320x240
 layer at (8,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (13,257) size 310x30
 layer at (332,52) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (332,52) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (337,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
index 56299e4..34bf3bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
index ca103ed..14a937e 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
@@ -16,6 +16,8 @@ layer at (308,283) size 300x30
 layer at (8,8) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,8) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -46,6 +48,8 @@ layer at (308,128) size 300x30
 layer at (8,163) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,163) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,278) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
index 42413e1..16e3f31 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,0) size 320x15
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
index e48d9c6..342e126 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (12,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (4,0) size 15x205
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-aspect-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-aspect-ratio-expected.txt
index d341259..f63ed16 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-aspect-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-aspect-ratio-expected.txt
@@ -25,9 +25,49 @@ layer at (8,404) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
 layer at (168,404) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,44) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (328,284) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,284) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (8,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (328,404) size 320x120
   RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
 layer at (328,404) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (488,404) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (488,404) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (488,404) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv420-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv420-expected.txt
index f8010e9..7fcde0e 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv420-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv420-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,36) size 784x156
 layer at (8,44) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv422-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv422-expected.txt
index 90e8a58..5bacc3b 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv422-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-colorspace-yuv422-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,36) size 784x156
 layer at (8,44) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
index 4db0f57..be68bfc 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
@@ -18,6 +18,8 @@ layer at (8,284) size 320x240
 layer at (8,44) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,44) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -38,6 +40,8 @@ layer at (13,249) size 310x30
 layer at (8,284) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,284) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -60,6 +64,8 @@ layer at (8,524) size 320x240
 layer at (8,524) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,524) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,729) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
index 8af1137..37865fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
@@ -12,6 +12,8 @@ layer at (8,28) size 320x240
 layer at (8,28) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,28) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,233) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
index 36414e0..0384a7b 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 302x152
 layer at (9,45) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (9,45) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (14,160) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-layer-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-layer-crash-expected.txt
index 7eeaf4f..9eebcec 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-layer-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-layer-crash-expected.txt
@@ -18,5 +18,15 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,337) size 0x0
 layer at (12,64) size 206x156
   RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,67) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,67) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,225) size 206x156
   RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,228) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,228) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
index f1fd2d7ff..fcae4ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
@@ -13,6 +13,8 @@ layer at (8,44) size 352x288
 layer at (8,44) size 352x288
   RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,44) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
 layer at (13,297) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-transformed-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-transformed-expected.txt
index bf06a69..51e6af5 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-transformed-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-transformed-expected.txt
@@ -18,7 +18,22 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,478) size 0x0
 layer at (12,44) size 206x156
   RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,47) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,47) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,205) size 206x156
   RenderVideo {VIDEO} at (4,161) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,208) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,208) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,366) size 206x156
   RenderVideo {VIDEO} at (4,322) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,369) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,369) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
index 24af02e..48420c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
@@ -11,6 +11,8 @@ layer at (57,85) size 240x180
 layer at (57,85) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,85) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,213) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
@@ -33,6 +35,8 @@ layer at (57,310) size 240x180
 layer at (57,310) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,310) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,438) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-expected.txt
index 7c9d6efb..cfcf785 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-expected.txt
@@ -21,3 +21,13 @@ layer at (12,44) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
 layer at (12,469) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (16,48) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,48) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
+layer at (16,473) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,473) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..a5b5ab0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,16) size 784x20
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 447x19
+          text run at (0,0) width 447: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225
+  RenderBlock (positioned) {DIV} at (8,52) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x105
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,116) size 100x100 [bgcolor=#FF0000]
+layer at (19,63) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,63) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,63) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
+layer at (19,168) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,116) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..3c8d443
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (0,0) size 800x105
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x60
+      RenderText {#text} at (0,0) size 198x59
+        text run at (0,0) width 182: "The green box should obscure"
+        text run at (0,20) width 198: "the red box, and move when you"
+        text run at (0,40) width 109: "drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
index 5ce7dc9..b2ae2b8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -10,6 +10,11 @@ layer at (0,0) size 785x1016
           text run at (0,0) width 453: "The blue bar should be in front of the video, and at the top of the page."
 layer at (8,88) size 400x300
   RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (8,88) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (8,88) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (0,50) size 500x60
   RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
 scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
index 0dd132f..7a1ff29 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
@@ -12,6 +12,11 @@ layer at (8,50) size 402x302
       RenderText {#text} at (0,0) size 0x0
 layer at (9,51) size 400x300
   RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,51) size 400x300
+  RenderFlexibleBox {DIV} at (0,0) size 400x300
+    RenderBlock {DIV} at (0,265) size 400x35
+layer at (9,51) size 400x265
+  RenderFlexibleBox {DIV} at (0,0) size 400x265
 layer at (9,355) size 10x10 transparent
   RenderBlock {DIV} at (1,305) size 10x10 [bgcolor=#008000]
 layer at (9,291) size 400x60
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
index fc1b3ac..317328b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
@@ -13,3 +13,8 @@ layer at (19,51) size 300x200
 layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 100 scrollHeight 500
   RenderBlock {DIV} at (10,250) size 302x152 [border: (1px solid #000000)]
     RenderBlock {DIV} at (1,1) size 285x500
+layer at (19,51) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
index de27c1d..facc6b3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -13,5 +13,10 @@ layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
     RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
 layer at (19,61) size 100x100
   RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,61) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,61) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
 layer at (19,165) size 100x100
   RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
index 936dbb4..83f2530 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -20,3 +20,8 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeig
     RenderBlock {DIV} at (1,51) size 185x500
 layer at (51,51) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
index 82d28b5..0eda5ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
@@ -11,3 +11,8 @@ layer at (8,50) size 300x292
     RenderText {#text} at (0,0) size 0x0
 layer at (8,50) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
+layer at (8,50) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,50) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
index d933538..862fbc7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
@@ -21,3 +21,8 @@ layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 24 scrollHe
       RenderBR {BR} at (47,54) size 1x36
       RenderText {#text} at (0,102) size 64x36
         text run at (0,102) width 64: "here."
+layer at (19,51) size 300x200
+  RenderFlexibleBox {DIV} at (0,0) size 300x200
+    RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+  RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
index 22c7c6b..5c5f389 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
@@ -15,3 +15,13 @@ layer at (8,50) size 320x180
   RenderVideo {VIDEO} at (0,0) size 320x180
 layer at (332,50) size 320x180
   RenderVideo {VIDEO} at (324,0) size 320x180
+layer at (8,50) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (8,50) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
+layer at (332,50) size 320x180
+  RenderFlexibleBox {DIV} at (0,0) size 320x180
+    RenderBlock {DIV} at (0,145) size 320x35
+layer at (332,50) size 320x145
+  RenderFlexibleBox {DIV} at (0,0) size 320x145
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
index 54613c6..a2839c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
@@ -37,8 +37,17 @@ Case: Displaying movie
       "drawsContent": true,
       "children": [
         {
-          "position": [8, 8],
-          "bounds": [352, 288]
+          "children": [
+            {
+              "position": [8, 8],
+              "bounds": [352, 288]
+            },
+            {
+              "position": [8, 8],
+              "bounds": [352, 288],
+              "drawsContent": true
+            }
+          ]
         }
       ]
     }
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.txt
index c410869..ec94f44 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x348
         RenderText {#text} at (0,0) size 0x0
 layer at (8,111) size 400x225
   RenderVideo {VIDEO} at (0,0) size 400x225 [bgcolor=#808080]
+layer at (8,111) size 400x225
+  RenderFlexibleBox {DIV} at (0,0) size 400x225
+    RenderBlock {DIV} at (0,190) size 400x35
+layer at (8,111) size 400x190
+  RenderFlexibleBox {DIV} at (0,0) size 400x190
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.txt
index f2f8579..edcfa9b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.txt
@@ -19,3 +19,8 @@ layer at (0,0) size 800x348
         RenderText {#text} at (0,0) size 0x0
 layer at (8,111) size 500x225
   RenderVideo {VIDEO} at (0,0) size 500x225 [bgcolor=#808080]
+layer at (8,111) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (8,111) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.txt
index ea4644f8..a025ae28 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.txt
@@ -23,3 +23,8 @@ layer at (0,0) size 800x386
         RenderText {#text} at (0,0) size 0x0
 layer at (18,139) size 500x225
   RenderVideo {VIDEO} at (10,10) size 500x225 [bgcolor=#808080]
+layer at (18,139) size 500x225
+  RenderFlexibleBox {DIV} at (0,0) size 500x225
+    RenderBlock {DIV} at (0,190) size 500x35
+layer at (18,139) size 500x190
+  RenderFlexibleBox {DIV} at (0,0) size 500x190
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
index 666f656..8331cb6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -13,6 +13,8 @@ layer at (8,26) size 300x150
 layer at (8,26) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,26) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,141) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
index 4f570b4..e4ea573 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
@@ -18,6 +18,8 @@ layer at (58,110) size 302x152 transparent
 layer at (59,111) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (59,111) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (64,226) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.txt
index 1593093..a0eb3de 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.txt
@@ -33,3 +33,8 @@ layer at (8,392) size 300x150
   RenderVideo {VIDEO} at (0,384) size 300x150
 layer at (8,546) size 556x406
   RenderEmbeddedObject {EMBED} at (0,538) size 556x406 [bgcolor=#00FF00] [border: (3px solid #000000)]
+layer at (8,392) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,392) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index f92bb7d..2d06f8d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
index 453e69b..acb5300 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
@@ -13,6 +13,8 @@ layer at (8,50) size 320x240
 layer at (8,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
index c89e430..f0935e7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -17,6 +17,8 @@ layer at (8,282) size 320x240
 layer at (18,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (18,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (23,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (23,247) size 310x30
 layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,282) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
index ec6bcea..7af025b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
@@ -17,6 +17,8 @@ layer at (332,50) size 320x240
 layer at (8,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -37,6 +39,8 @@ layer at (13,255) size 310x30
 layer at (332,50) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (332,50) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (337,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
index ff3a659..b303313 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
index fdd48b4..385666d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
@@ -16,6 +16,8 @@ layer at (308,282) size 300x30
 layer at (8,8) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,8) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -46,6 +48,8 @@ layer at (308,128) size 300x30
 layer at (8,162) size 300x150
   RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (8,162) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (13,277) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
index c8fd2ee..5320e40 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (8,8) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,0) size 320x15
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
index 7532715..bee2693 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
@@ -28,6 +28,8 @@ layer at (8,8) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
 layer at (12,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (4,0) size 15x205
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt
index 42fd6ce..6343329 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt
@@ -25,9 +25,49 @@ layer at (8,402) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
 layer at (168,402) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
+layer at (8,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (328,282) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,282) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (8,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (8,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
+layer at (168,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (168,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (328,402) size 320x120
   RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
 layer at (328,402) size 160x120
   RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (328,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
 layer at (488,402) size 160x120
   RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (488,402) size 160x120
+  RenderFlexibleBox {DIV} at (0,0) size 160x120
+    RenderBlock {DIV} at (0,85) size 160x35
+layer at (488,402) size 160x85
+  RenderFlexibleBox {DIV} at (0,0) size 160x85
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.txt
index b1070eb..ce152c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,34) size 784x156
 layer at (8,42) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.txt
index b78b781..cbe525f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.txt
@@ -9,3 +9,8 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,34) size 784x156
 layer at (8,42) size 206x156
   RenderVideo {VIDEO} at (0,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (11,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (11,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
index 06c3e52a..c37d336 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
@@ -18,6 +18,8 @@ layer at (8,282) size 320x240
 layer at (8,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,42) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -38,6 +40,8 @@ layer at (13,247) size 310x30
 layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,282) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
@@ -60,6 +64,8 @@ layer at (8,522) size 320x240
 layer at (8,522) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,522) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,727) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index 469893d..a26aa9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
@@ -12,6 +12,8 @@ layer at (8,26) size 320x240
 layer at (8,26) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
+layer at (8,26) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x205
 layer at (13,231) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
index cbd33d0..2a4827e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 302x152
 layer at (9,43) size 300x150
   RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
+layer at (9,43) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x115
 layer at (14,158) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.txt
index 60cda67..2af0093 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.txt
@@ -18,5 +18,15 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,334) size 0x0
 layer at (12,60) size 206x156
   RenderVideo {VIDEO} at (4,18) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,63) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,63) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,220) size 206x156
   RenderVideo {VIDEO} at (4,178) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,223) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,223) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
index b834b35..5430485 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
@@ -13,6 +13,8 @@ layer at (8,42) size 352x288
 layer at (8,42) size 352x288
   RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,42) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x253
 layer at (13,295) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-transformed-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-transformed-expected.txt
index f5389c4..bd151d9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-transformed-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-transformed-expected.txt
@@ -18,7 +18,22 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (210,476) size 0x0
 layer at (12,42) size 206x156
   RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,45) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,45) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,202) size 206x156
   RenderVideo {VIDEO} at (4,160) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,205) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,205) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
 layer at (12,362) size 206x156
   RenderVideo {VIDEO} at (4,320) size 206x156 [border: (3px solid #FF0000)]
+layer at (15,365) size 200x150
+  RenderFlexibleBox {DIV} at (3,3) size 200x150
+    RenderBlock {DIV} at (0,115) size 200x35
+layer at (15,365) size 200x115
+  RenderFlexibleBox {DIV} at (0,0) size 200x115
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
index 96cf961..3a09704 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
@@ -11,6 +11,8 @@ layer at (57,84) size 240x180
 layer at (57,84) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,84) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,212) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
@@ -33,6 +35,8 @@ layer at (57,309) size 240x180
 layer at (57,309) size 240x180
   RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127.50) size 240x52.50
+layer at (57,309) size 240x128 scrollHeight 127
+  RenderFlexibleBox {DIV} at (0,0) size 240x127.50
 layer at (65,437) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.txt
index 5385497..0ba9410 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.txt
@@ -21,3 +21,13 @@ layer at (12,42) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
 layer at (12,464) size 488x368
   RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (16,46) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,46) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
+layer at (16,468) size 480x360
+  RenderFlexibleBox {DIV} at (4,4) size 480x360
+    RenderBlock {DIV} at (0,307.50) size 480x52.50
+layer at (16,468) size 480x308 scrollHeight 307
+  RenderFlexibleBox {DIV} at (0,0) size 480x307.50
diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
new file mode 100644
index 0000000..facc6b3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 475x17
+          text run at (0,0) width 475: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
+  RenderBlock (positioned) {DIV} at (8,50) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x104
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
+layer at (19,61) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,61) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,61) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
+layer at (19,165) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
new file mode 100644
index 0000000..83f2530
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x104
+  RenderBlock {HTML} at (0,0) size 800x104
+    RenderBody {BODY} at (0,0) size 800x104
+      RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100
+layer at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
+layer at (50,50) size 200x200
+  RenderBlock (positioned) {DIV} at (50,50) size 200x200
+    RenderBlock {P} at (0,218) size 200x54
+      RenderText {#text} at (0,0) size 193x53
+        text run at (0,0) width 193: "The green box should obscure"
+        text run at (0,18) width 182: "the red box, and move when"
+        text run at (0,36) width 144: "you drag the scrollbar."
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
+  RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
+    RenderBlock {DIV} at (1,51) size 185x500
+layer at (51,51) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+  RenderFlexibleBox {DIV} at (0,0) size 100x100
+    RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+  RenderFlexibleBox {DIV} at (0,0) size 100x65
author	wangxianzhu@chromium.org <wangxianzhu@chromium.org>	2014-09-16 21:28:44 +0000
committer	wangxianzhu@chromium.org <wangxianzhu@chromium.org>	2014-09-16 21:28:44 +0000
commit	3c532da04bddcac2c394426cd299173f42b2c56b (patch)
tree	607e656a73c66c02c99699d6d9643966c56c404d /third_party/WebKit/LayoutTests/platform
parent	c0021a54492fd5a27962d49d7f176b8ae59e4cbf (diff)
download	chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.zip chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.gz chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.bz2