Rebaseline of media tests after WebKit r49259.

BUG=none
TEST=these layout tests

Review URL: http://codereview.chromium.org/261015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28444 0039d316-1c4b-4281-b951-d872f2087c98

55 files changed, 312 insertions, 572 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.checksum
index 340f747..556d5d1 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-4d91dfd4ad25a309d38758eb89b61b98
\ No newline at end of file
+b8b99b75f49ac7b2fe4d069b1577423d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.png
index ed0141f..fb19e82 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.txt
deleted file mode 100644
index 778abe8..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/audio-controls-rendering-expected.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-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 147x19
-          text run at (0,0) width 147: "Test controls placement."
-      RenderBlock (anonymous) at (0,36) size 784x124
-        RenderMedia {AUDIO} at (0,0) size 300x32 [bgcolor=#0000FF]
-        RenderBR {BR} at (300,32) size 0x0
-        RenderBR {BR} at (0,32) size 0x19
-        RenderMedia {AUDIO} at (0,52) size 320x32 [bgcolor=#0000FF]
-        RenderBR {BR} at (320,84) size 0x0
-        RenderBR {BR} at (0,84) size 0x19
-        RenderBR {BR} at (0,104) size 0x19
-layer at (8,44) size 300x32
-  RenderBlock (relative positioned) {DIV} at (0,0) size 300x32
-layer at (8,44) size 300x32
-  RenderFlexibleBox (positioned) {DIV} at (0,0) size 300x32 [bgcolor=#00000099]
-layer at (15,50) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,44) size 236x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
-layer at (216,50) size 58x20
-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,50) size 165x24
-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (274,44) size 34x32
-  RenderButton {INPUT} at (266,0) size 34x32
-layer at (8,96) size 320x32
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x32
-layer at (8,96) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x32 [bgcolor=#00000099]
-layer at (15,102) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,96) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,102) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,102) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,96) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
-layer at (8,148) size 320x100
-  RenderMedia {AUDIO} at (8,148) size 320x100 [bgcolor=#0000FF]
-layer at (8,148) size 320x100
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
-layer at (8,216) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,68) size 320x32 [bgcolor=#00000099]
-layer at (15,222) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,216) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,222) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,222) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,216) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.checksum
index 6e47042..326c2cc 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.checksum
@@ -1 +1 @@
-1c5fcacaf61d433ad2b0d3ccf494f4e1
\ No newline at end of file
+350a67ba0f8e71ba885170f530db2e5c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.png
index dbc7773..f373acb 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.txt
deleted file mode 100644
index 97fc3d1..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-after-reload-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-        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,44) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,252) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,258) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,252) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,258) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,258) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,252) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.checksum
index ffade59..6502da6 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.checksum
@@ -1 +1 @@
-70e9242ebf2fda34a8fb34ff6bb529c4
\ No newline at end of file
+5a6ba86f3955cc5ac33ca656a7694f90
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.png
index 88cba23..241a682 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.txt
deleted file mode 100644
index ee6b651..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/controls-strict-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-        RenderText {#text} at (0,0) size 0x0
-        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
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,260) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,266) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,260) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,266) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,266) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,260) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.checksum
index 901f0da..68285cd 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.checksum
@@ -1 +1 @@
-2218204838570bee25370fb1b07adea0
\ No newline at end of file
+6f0358a83b9d89518ccd36c49ce3c467
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.png
index ecd39d1..5fe2760 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.txt
deleted file mode 100644
index 050cfe7..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-controls-rendering-expected.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-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
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,252) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,258) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,252) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,258) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,258) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,252) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
-layer at (8,284) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,492) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,498) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,492) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,498) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,498) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,492) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
-layer at (8,524) size 320x240
-  RenderVideo {VIDEO} at (8,524) size 320x240
-layer at (8,524) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,732) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,738) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,732) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,738) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,738) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,732) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.checksum
index 521acc6..3d00c54 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.checksum
@@ -1 +1 @@
-2e76282877efd2437086e4af38ab3101
\ No newline at end of file
+667fab558e58ac941aa1f43fc6e9a87a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.png
index 33ffda0..d13998c 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.txt
deleted file mode 100644
index 3ad65b5..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-display-toggle-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-      RenderText {#text} at (0,0) 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
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,236) size 320x32
-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,242) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,236) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,242) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (44,242) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,236) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.checksum
index e9004f5..ee6cea9 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.checksum
@@ -1 +1 @@
-4fba40cf9e8047b7f1700bb21b58fe3b
\ No newline at end of file
+9c300640a0e9d2eefed2409c4380b5e8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.png
index cdd64d4..e62499f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.txt
deleted file mode 100644
index 40358d3..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-empty-source-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-        RenderText {#text} at (0,0) size 0x0
-        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
-  RenderBlock (relative positioned) {DIV} at (1,1) size 300x150
-layer at (9,163) size 300x32
-  RenderFlexibleBox (positioned) {DIV} at (0,118) size 300x32 [bgcolor=#00000099]
-layer at (16,169) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (39,163) size 236x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
-layer at (217,169) size 58x20
-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (8,1) size 42x19
-      text run at (8,1) width 42: "00:00"
-layer at (45,169) size 165x24
-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-    RenderBlock {DIV} at (3,-5) size 9x29
-layer at (275,163) size 34x32
-  RenderButton {INPUT} at (266,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
index cf7db37..6bb099f 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-ecbf628b643cb84fcbd8e28e72fe4aba
\ No newline at end of file
+9b74bec98d4370d8c99ebb0225b8dd8b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
index 8c498d0..e3e7e64 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.txt
index ea4d251..16a5ef8 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.txt
@@ -21,13 +21,13 @@ layer at (8,42) size 300x32
 layer at (15,48) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,42) size 236x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
-layer at (216,48) size 58x20
-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (215,48) size 58x20
+  RenderBlock (positioned) {DIV} at (177,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,48) size 165x24
-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,49) size 163x24
+  RenderSlider {INPUT} at (7,7) size 163x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (274,42) size 34x32
   RenderButton {INPUT} at (266,0) size 34x32
@@ -38,13 +38,13 @@ layer at (8,92) size 320x32
 layer at (15,98) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,92) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,98) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,98) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,98) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,99) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,92) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
@@ -57,13 +57,13 @@ layer at (8,210) size 320x32
 layer at (15,216) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,210) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,216) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,216) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,216) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,217) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,210) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
index a65121f..7281aeb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
@@ -1 +1 @@
-72457e75388c2dbb1e4c77f0aeac82a0
\ No newline at end of file
+61b3a57d46c816f68c854afba92a3b28
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
index 6c7f85a..0967522 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.txt
index e4036b3..337fc41 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.txt
@@ -19,13 +19,13 @@ layer at (8,250) size 320x32
 layer at (15,256) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,250) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,256) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,256) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,256) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,257) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,250) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
index 6dd34dd..d550ec8 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
@@ -1 +1 @@
-84dce9fd59391ac7fdb9cd717e87b843
\ No newline at end of file
+74786294fa010f52548c2d6abafbd926
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
index 7f8c5b5..0497b36 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.txt
index 090b9be..4323c12 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.txt
@@ -19,13 +19,13 @@ layer at (8,258) size 320x32
 layer at (15,264) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,258) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,264) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,264) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,264) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,265) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,258) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
index 978e083..016e865 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
@@ -1 +1 @@
-3ef34842a7222731149005e3fd128dae
\ No newline at end of file
+966c05f2b4828c25e745f37598ecc1a8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
index b4b28df..d8ecbf3 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.txt
index b78aba7..9d0b9fb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.txt
@@ -22,13 +22,13 @@ layer at (8,250) size 320x32
 layer at (15,256) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,250) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,256) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,256) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,256) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,257) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,250) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
@@ -39,13 +39,13 @@ layer at (8,490) size 320x32
 layer at (15,496) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,490) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,496) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,496) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,496) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,497) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,490) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
@@ -58,13 +58,13 @@ layer at (8,730) size 320x32
 layer at (15,736) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,730) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,736) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,736) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,736) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,737) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,730) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
index d444997..147bdc1 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
@@ -1 +1 @@
-e60a8ddac4ac66e449b4c28fea5a123d
\ No newline at end of file
+fba4aa5f898a5c83cddc26e0668a60b2
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
index aba0c32..ca8a50b 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.txt
index 405ba11..73631cc 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.txt
@@ -18,13 +18,13 @@ layer at (8,234) size 320x32
 layer at (15,240) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,234) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,240) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,240) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (44,240) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,241) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,234) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.checksum
index 8a411fd..09bbc44 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.checksum
@@ -1 +1 @@
-2c87f086b18bd3e631c96b1db911a717
\ No newline at end of file
+5f2ba26d5b68eb4f181f581343dbd34d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.png
index afa0ff6..66b902a 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.txt
index cbcd9bb..c32e483 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.txt
@@ -19,11 +19,13 @@ layer at (9,161) size 300x32
 layer at (16,167) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (39,161) size 236x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
-layer at (217,167) size 58x20
-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (216,167) size 58x20
+  RenderBlock (positioned) {DIV} at (177,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,2) size 41x17
       text run at (8,2) width 41: "00:00"
-layer at (45,167) size 165x24
-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (46,168) size 163x24
+  RenderSlider {INPUT} at (7,7) size 163x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
+layer at (275,161) size 34x32
+  RenderButton {INPUT} at (266,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.checksum
index 72a627c4..00ba107 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-aabbfa58c25b2776018a7017615a5a86
\ No newline at end of file
+f0afee5d00b0f3cf6ffa093001e85cdb
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.png
index 99e7b30..c18b65b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.txt
index 7e73f95..d7a8791 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.txt
@@ -1,69 +1,69 @@
-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 147x19

-          text run at (0,0) width 147: "Test controls placement."

-      RenderBlock (anonymous) at (0,36) size 784x124

-        RenderMedia {AUDIO} at (0,0) size 300x32 [bgcolor=#0000FF]

-        RenderBR {BR} at (300,32) size 0x0

-        RenderBR {BR} at (0,32) size 0x19

-        RenderMedia {AUDIO} at (0,52) size 320x32 [bgcolor=#0000FF]

-        RenderBR {BR} at (320,84) size 0x0

-        RenderBR {BR} at (0,84) size 0x19

-        RenderBR {BR} at (0,104) size 0x19

-layer at (8,44) size 300x32

-  RenderBlock (relative positioned) {DIV} at (0,0) size 300x32

-layer at (8,44) size 300x32

-  RenderFlexibleBox (positioned) {DIV} at (0,0) size 300x32 [bgcolor=#00000099]

-layer at (15,50) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,44) size 236x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32

-layer at (216,50) size 58x20

-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,50) size 165x24

-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (274,44) size 34x32

-  RenderButton {INPUT} at (266,0) size 34x32

-layer at (8,96) size 320x32

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x32

-layer at (8,96) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x32 [bgcolor=#00000099]

-layer at (15,102) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,96) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,102) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,102) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,96) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

-layer at (8,148) size 320x100

-  RenderMedia {AUDIO} at (8,148) size 320x100 [bgcolor=#0000FF]

-layer at (8,148) size 320x100

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x100

-layer at (8,216) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,68) size 320x32 [bgcolor=#00000099]

-layer at (15,222) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,216) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,222) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,222) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,216) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

+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 147x19
+          text run at (0,0) width 147: "Test controls placement."
+      RenderBlock (anonymous) at (0,36) size 784x124
+        RenderMedia {AUDIO} at (0,0) size 300x32 [bgcolor=#0000FF]
+        RenderBR {BR} at (300,32) size 0x0
+        RenderBR {BR} at (0,32) size 0x19
+        RenderMedia {AUDIO} at (0,52) size 320x32 [bgcolor=#0000FF]
+        RenderBR {BR} at (320,84) size 0x0
+        RenderBR {BR} at (0,84) size 0x19
+        RenderBR {BR} at (0,104) size 0x19
+layer at (8,44) size 300x32
+  RenderBlock (relative positioned) {DIV} at (0,0) size 300x32
+layer at (8,44) size 300x32
+  RenderFlexibleBox (positioned) {DIV} at (0,0) size 300x32 [bgcolor=#00000099]
+layer at (15,50) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,44) size 236x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (215,50) size 58x20
+  RenderBlock (positioned) {DIV} at (177,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,51) size 163x24
+  RenderSlider {INPUT} at (7,7) size 163x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (274,44) size 34x32
+  RenderButton {INPUT} at (266,0) size 34x32
+layer at (8,96) size 320x32
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x32
+layer at (8,96) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x32 [bgcolor=#00000099]
+layer at (15,102) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,96) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,102) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,103) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,96) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,148) size 320x100
+  RenderMedia {AUDIO} at (8,148) size 320x100 [bgcolor=#0000FF]
+layer at (8,148) size 320x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
+layer at (8,216) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,68) size 320x32 [bgcolor=#00000099]
+layer at (15,222) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,216) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,222) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,223) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,216) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.checksum
index e31978b..dbddd27 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.checksum
@@ -1 +1 @@
-e241964ee9f94b2b45d07ce69e864504
\ No newline at end of file
+2c56b7c2fcf86a8c4e6b348d2eebf63c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.png
index ae33adf..dba2738 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.txt
index bc7ba19..85dbd33 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.txt
@@ -1,31 +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

-      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

-        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,44) size 320x240

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,252) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,258) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,252) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,258) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,258) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,252) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

+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
+        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,44) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,252) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,258) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,252) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,258) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,259) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,252) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum
index 76d9a315c..02fbc54 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum
@@ -1 +1 @@
-8c2e714ab3240b40cb357415de694449
\ No newline at end of file
+2239e7a2100494174b6a5328ea769f48
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.png
index c1dca48..f4fbbc6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.txt
index ce6ccea..d99b8f3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.txt
@@ -1,31 +1,31 @@
-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

-        RenderText {#text} at (0,0) size 0x0

-        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

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,260) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,266) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,260) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,266) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,266) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,260) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

+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
+        RenderText {#text} at (0,0) size 0x0
+        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
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,260) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,266) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,260) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,266) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,267) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,260) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.checksum
index 12d8c7a..680b39d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.checksum
@@ -1 +1 @@
-39dc5e4e971d1cbeff1054dd4ecf5dd2
\ No newline at end of file
+e241575266d959ceccd14020d4ae0acf
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.png
index 1863e17..4132dd8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.txt
index 39dbe88..124e41e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.txt
@@ -1,70 +1,70 @@
-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

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,252) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,258) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,252) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,258) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,258) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,252) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

-layer at (8,284) size 320x240

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,492) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,498) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,492) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,498) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,498) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,492) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

-layer at (8,524) size 320x240

-  RenderVideo {VIDEO} at (8,524) size 320x240

-layer at (8,524) size 320x240

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,732) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,738) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,732) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,738) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,738) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,732) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

+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
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,252) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,258) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,252) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,258) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,259) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,252) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,284) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,492) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,498) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,492) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,498) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,499) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,492) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,524) size 320x240
+  RenderVideo {VIDEO} at (8,524) size 320x240
+layer at (8,524) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,732) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,738) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,732) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,738) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,739) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,732) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.checksum
index fa56beb..a9f4574 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.checksum
@@ -1 +1 @@
-f35d164beb1e9942c96aa31557300032
\ No newline at end of file
+2a2343b57c6f86790ec2393f84e74b5a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.png
index e0d5047..d118a97 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.txt
index 871c348..76e49d8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-display-toggle-expected.txt
@@ -1,30 +1,30 @@
-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

-      RenderText {#text} at (0,0) 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

-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240

-layer at (8,236) size 320x32

-  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]

-layer at (15,242) size 18x19

-  RenderButton {INPUT} at (7,6) size 18x19

-layer at (38,236) size 256x32

-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32

-layer at (236,242) size 58x20

-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]

-    RenderText {#text} at (8,1) size 42x19

-      text run at (8,1) width 42: "00:00"

-layer at (44,242) size 185x24

-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]

-    RenderBlock {DIV} at (3,-5) size 9x29

-layer at (294,236) size 34x32

-  RenderButton {INPUT} at (286,0) size 34x32

+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
+      RenderText {#text} at (0,0) 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
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,236) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,242) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,236) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,242) size 58x20
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (45,243) size 183x24
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,236) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.checksum
index 1572ddc..d245541 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.checksum
@@ -1 +1 @@
-915548ad1ac10e4835e004b2b64c63a4
\ No newline at end of file
+0db0da2dff3624010a92b685eb410d5f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.png
index bfc8d9d..8b77e58 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.txt
index 40358d3..8c573a7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.txt
@@ -19,13 +19,13 @@ layer at (9,163) size 300x32
 layer at (16,169) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (39,163) size 236x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32
-layer at (217,169) size 58x20
-  RenderBlock (positioned) {DIV} at (178,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 236x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (216,169) size 58x20
+  RenderBlock (positioned) {DIV} at (177,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,1) size 42x19
       text run at (8,1) width 42: "00:00"
-layer at (45,169) size 165x24
-  RenderSlider {INPUT} at (6,6) size 165x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (46,170) size 163x24
+  RenderSlider {INPUT} at (7,7) size 163x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (275,163) size 34x32
   RenderButton {INPUT} at (266,0) size 34x32
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 510b7c6..5d53f17 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3102,12 +3102,12 @@ BUG24159 WIN LINUX : LayoutTests/fast/css/opacity-float.html = FAIL
 BUG24167 WIN DEBUG : LayoutTests/http/tests/security/cross-frame-access-port-explicit-domain.html = PASS FAIL
 
 // WebKit roll 49254:49260
-BUG_JOHNNYG REBASELINE : LayoutTests/media/audio-controls-rendering.html = FAIL
-BUG_JOHNNYG REBASELINE : LayoutTests/media/controls-after-reload.html = FAIL
-BUG_JOHNNYG REBASELINE : LayoutTests/media/controls-strict.html = FAIL
-BUG_JOHNNYG REBASELINE : LayoutTests/media/video-controls-rendering.html = FAIL
-BUG_JOHNNYG REBASELINE : LayoutTests/media/video-display-toggle.html = FAIL
-BUG_JOHNNYG REBASELINE : LayoutTests/media/video-empty-source.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/audio-controls-rendering.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/controls-after-reload.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/controls-strict.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/video-controls-rendering.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/video-display-toggle.html = FAIL
+BUG_JOHNNYG : LayoutTests/media/video-empty-source.html = FAIL
 
 // WebKit roll 49260:49288
 BUG_AA : LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html = FAIL