Rebaseline and mark some video layout tests as pass

The following tests needs to be rebaselined:

The following tests are marked as pass:

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

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

8 files changed, 279 insertions, 286 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.txt
index cc4847e..480bbdf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.txt
@@ -1,28 +1,34 @@
-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

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

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

-        RenderVideo {VIDEO} at (0,240) size 160x120

-        RenderBlock {DIV} at (160,240) size 320x120

-          RenderVideo {VIDEO} at (0,0) size 160x120

-          RenderVideo {VIDEO} at (160,0) size 160x120

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

-        RenderBlock {DIV} at (0,360) size 320x120

-          RenderVideo {VIDEO} at (0,0) size 160x120

-          RenderVideo {VIDEO} at (160,0) size 160x120

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

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

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

-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

+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
+        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/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 8bdb551..888cba9 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,83 +1,85 @@
-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

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

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

-      RenderBlock {DIV} at (0,276) size 769x240

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

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

-      RenderBlock {DIV} at (0,516) size 769x0

-layer at (8,44) size 320x240

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

-layer at (8,44) size 320x240

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

-    RenderButton {INPUT} at (0,0) size 320x20

-layer at (294,252) size 34x32

-  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]

-layer at (8,252) size 30x32

-  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]

-layer at (38,252) size 256x32

-  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]

-layer at (246,258) size 48x20

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

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

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

-layer at (38,262) size 206x17

-  RenderSlider {INPUT} at (0,10) size 206x13

-    RenderBlock {DIV} at (2,-4) size 11x21

-layer at (295,268) size 17x16

-  RenderButton {INPUT} at (287,224) size 17x16

-layer at (311,268) size 17x16

-  RenderButton {INPUT} at (303,224) size 17x16

-layer at (8,284) size 320x240

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

-layer at (8,284) size 320x240

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

-    RenderButton {INPUT} at (0,0) size 320x20

-layer at (294,492) size 34x32

-  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]

-layer at (8,492) size 30x32

-  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]

-layer at (38,492) size 256x32

-  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]

-layer at (246,498) size 48x20

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

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

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

-layer at (38,502) size 206x17

-  RenderSlider {INPUT} at (0,10) size 206x13

-    RenderBlock {DIV} at (2,-4) size 11x21

-layer at (295,508) size 17x16

-  RenderButton {INPUT} at (287,224) size 17x16

-layer at (311,508) size 17x16

-  RenderButton {INPUT} at (303,224) size 17x16

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

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

-    RenderButton {INPUT} at (0,0) size 320x20

-layer at (294,732) size 34x32

-  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]

-layer at (8,732) size 30x32

-  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]

-layer at (38,732) size 256x32

-  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]

-layer at (246,738) size 48x20

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

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

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

-layer at (38,742) size 206x17

-  RenderSlider {INPUT} at (0,10) size 206x13

-    RenderBlock {DIV} at (2,-4) size 11x21

-layer at (295,748) size 17x16

-  RenderButton {INPUT} at (287,224) size 17x16

-layer at (311,748) size 17x16

-  RenderButton {INPUT} at (303,224) size 17x16

+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,44) size 320x240
+  RenderBlock (positioned) {DIV} at (0,0) size 320x240
+    RenderButton {INPUT} at (0,0) size 320x20
+layer at (294,252) size 34x32
+  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]
+layer at (8,252) size 30x32
+  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]
+layer at (38,252) size 256x32
+  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]
+layer at (246,258) size 48x20
+  RenderBlock (positioned) {DIV} at (208,6) size 48x20 [color=#FFFFFF]
+    RenderText {#text} at (3,1) size 42x19
+      text run at (3,1) width 42: "00:00"
+layer at (38,262) size 206x17
+  RenderSlider {INPUT} at (0,10) size 206x13
+    RenderBlock {DIV} at (2,-4) size 11x21
+layer at (295,268) size 17x16
+  RenderButton {INPUT} at (287,224) size 17x16
+layer at (311,268) size 17x16
+  RenderButton {INPUT} at (303,224) size 17x16
+layer at (8,284) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,284) size 320x240
+  RenderBlock (positioned) {DIV} at (0,0) size 320x240
+    RenderButton {INPUT} at (0,0) size 320x20
+layer at (294,492) size 34x32
+  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]
+layer at (8,492) size 30x32
+  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]
+layer at (38,492) size 256x32
+  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]
+layer at (246,498) size 48x20
+  RenderBlock (positioned) {DIV} at (208,6) size 48x20 [color=#FFFFFF]
+    RenderText {#text} at (3,1) size 42x19
+      text run at (3,1) width 42: "00:00"
+layer at (38,502) size 206x17
+  RenderSlider {INPUT} at (0,10) size 206x13
+    RenderBlock {DIV} at (2,-4) size 11x21
+layer at (295,508) size 17x16
+  RenderButton {INPUT} at (287,224) size 17x16
+layer at (311,508) size 17x16
+  RenderButton {INPUT} at (303,224) size 17x16
+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,524) size 320x240
+  RenderBlock (positioned) {DIV} at (0,0) size 320x240
+    RenderButton {INPUT} at (0,0) size 320x20
+layer at (294,732) size 34x32
+  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]
+layer at (8,732) size 30x32
+  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]
+layer at (38,732) size 256x32
+  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]
+layer at (246,738) size 48x20
+  RenderBlock (positioned) {DIV} at (208,6) size 48x20 [color=#FFFFFF]
+    RenderText {#text} at (3,1) size 42x19
+      text run at (3,1) width 42: "00:00"
+layer at (38,742) size 206x17
+  RenderSlider {INPUT} at (0,10) size 206x13
+    RenderBlock {DIV} at (2,-4) size 11x21
+layer at (295,748) size 17x16
+  RenderButton {INPUT} at (287,224) size 17x16
+layer at (311,748) size 17x16
+  RenderButton {INPUT} at (303,224) size 17x16
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 3e40658..c309701 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,34 +1,35 @@
-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

-      RenderVideo {VIDEO} at (0,20) size 320x240

-      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

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

-layer at (8,28) size 320x240

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

-    RenderButton {INPUT} at (0,0) size 320x20

-layer at (294,236) size 34x32

-  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]

-layer at (8,236) size 30x32

-  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]

-layer at (38,236) size 256x32

-  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]

-layer at (246,242) size 48x20

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

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

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

-layer at (38,246) size 206x17

-  RenderSlider {INPUT} at (0,10) size 206x13

-    RenderBlock {DIV} at (2,-4) size 11x21

-layer at (295,252) size 17x16

-  RenderButton {INPUT} at (287,224) size 17x16

-layer at (311,252) size 17x16

-  RenderButton {INPUT} at (303,224) size 17x16

+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,28) size 320x240
+  RenderBlock (positioned) {DIV} at (0,0) size 320x240
+    RenderButton {INPUT} at (0,0) size 320x20
+layer at (294,236) size 34x32
+  RenderButton {INPUT} at (286,208) size 34x32 [bgcolor=#7B000099]
+layer at (8,236) size 30x32
+  RenderButton {INPUT} at (0,208) size 30x32 [bgcolor=#00DD0099]
+layer at (38,236) size 256x32
+  RenderBlock (positioned) {DIV} at (30,208) size 256x32 [bgcolor=#00000099]
+layer at (246,242) size 48x20
+  RenderBlock (positioned) {DIV} at (208,6) size 48x20 [color=#FFFFFF]
+    RenderText {#text} at (3,1) size 42x19
+      text run at (3,1) width 42: "00:00"
+layer at (38,246) size 206x17
+  RenderSlider {INPUT} at (0,10) size 206x13
+    RenderBlock {DIV} at (2,-4) size 11x21
+layer at (295,252) size 17x16
+  RenderButton {INPUT} at (287,224) size 17x16
+layer at (311,252) size 17x16
+  RenderButton {INPUT} at (303,224) size 17x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.txt
index 7bd7acc..28a44d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.txt
@@ -1,22 +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 206x317

-  RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]

-layer at (12,225) size 206x317

-  RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]

+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 206x317
+  RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,225) size 206x317
+  RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.txt
index ce7923d..bf06a69 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.txt
@@ -1,24 +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)]

+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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-controls-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-controls-expected.txt
index 33b2c58..6592b41 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-controls-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-controls-expected.txt
@@ -1,55 +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 (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."

-      RenderVideo {VIDEO} at (45,73) size 240x180

-layer at (57,85) size 240x180

-  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180

-layer at (57,85) size 240x180

-  RenderBlock (positioned) {DIV} at (0,0) size 240x180

-    RenderButton {INPUT} at (0,0) size 240x28

-layer at (246,217) size 51x48

-  RenderButton {INPUT} at (189,132) size 51x48 [bgcolor=#7B000099]

-layer at (57,217) size 45x48

-  RenderButton {INPUT} at (0,132) size 45x48 [bgcolor=#00DD0099]

-layer at (102,217) size 144x48

-  RenderBlock (positioned) {DIV} at (45,132) size 144x48 [bgcolor=#00000099]

-layer at (174,226) size 72x30

-  RenderBlock (positioned) {DIV} at (72,9) size 72x30 [color=#FFFFFF]

-    RenderText {#text} at (6,1) size 59x29

-      text run at (6,1) width 59: "00:00"

-layer at (102,233) size 69x20

-  RenderSlider {INPUT} at (0,16) size 69x19

-    RenderBlock {DIV} at (3,-1) size 11x21

-layer at (248,241) size 25x24

-  RenderButton {INPUT} at (191,156) size 25x24

-layer at (272,241) size 25x24

-  RenderButton {INPUT} at (215,156) size 25x24

-layer at (57,310) size 240x180

-  RenderVideo {VIDEO} at (45,298) size 240x180

-layer at (57,310) size 240x180

-  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180

-layer at (57,310) size 240x180

-  RenderBlock (positioned) {DIV} at (0,0) size 240x180

-    RenderButton {INPUT} at (0,0) size 240x28

-layer at (246,442) size 51x48

-  RenderButton {INPUT} at (189,132) size 51x48 [bgcolor=#7B000099]

-layer at (57,442) size 45x48

-  RenderButton {INPUT} at (0,132) size 45x48 [bgcolor=#00DD0099]

-layer at (102,442) size 144x48

-  RenderBlock (positioned) {DIV} at (45,132) size 144x48 [bgcolor=#00000099]

-layer at (174,451) size 72x30

-  RenderBlock (positioned) {DIV} at (72,9) size 72x30 [color=#FFFFFF]

-    RenderText {#text} at (6,1) size 59x29

-      text run at (6,1) width 59: "00:00"

-layer at (102,458) size 69x20

-  RenderSlider {INPUT} at (0,16) size 69x19

-    RenderBlock {DIV} at (3,-1) size 11x21

-layer at (248,466) size 25x24

-  RenderButton {INPUT} at (191,156) size 25x24

-layer at (272,466) size 25x24

-  RenderButton {INPUT} at (215,156) size 25x24

+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
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,85) size 240x180
+  RenderBlock (positioned) {DIV} at (0,0) size 240x180
+    RenderButton {INPUT} at (0,0) size 240x28
+layer at (246,217) size 51x48
+  RenderButton {INPUT} at (189,132) size 51x48 [bgcolor=#7B000099]
+layer at (57,217) size 45x48
+  RenderButton {INPUT} at (0,132) size 45x48 [bgcolor=#00DD0099]
+layer at (102,217) size 144x48
+  RenderBlock (positioned) {DIV} at (45,132) size 144x48 [bgcolor=#00000099]
+layer at (174,226) size 72x30
+  RenderBlock (positioned) {DIV} at (72,9) size 72x30 [color=#FFFFFF]
+    RenderText {#text} at (6,1) size 59x29
+      text run at (6,1) width 59: "00:00"
+layer at (102,233) size 69x20
+  RenderSlider {INPUT} at (0,16) size 69x19
+    RenderBlock {DIV} at (3,-1) size 11x21
+layer at (248,241) size 25x24
+  RenderButton {INPUT} at (191,156) size 25x24
+layer at (272,241) size 25x24
+  RenderButton {INPUT} at (215,156) size 25x24
+layer at (57,310) size 240x180
+  RenderVideo {VIDEO} at (45,298) size 240x180
+layer at (57,310) size 240x180
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,310) size 240x180
+  RenderBlock (positioned) {DIV} at (0,0) size 240x180
+    RenderButton {INPUT} at (0,0) size 240x28
+layer at (246,442) size 51x48
+  RenderButton {INPUT} at (189,132) size 51x48 [bgcolor=#7B000099]
+layer at (57,442) size 45x48
+  RenderButton {INPUT} at (0,132) size 45x48 [bgcolor=#00DD0099]
+layer at (102,442) size 144x48
+  RenderBlock (positioned) {DIV} at (45,132) size 144x48 [bgcolor=#00000099]
+layer at (174,451) size 72x30
+  RenderBlock (positioned) {DIV} at (72,9) size 72x30 [color=#FFFFFF]
+    RenderText {#text} at (6,1) size 59x29
+      text run at (6,1) width 59: "00:00"
+layer at (102,458) size 69x20
+  RenderSlider {INPUT} at (0,16) size 69x19
+    RenderBlock {DIV} at (3,-1) size 11x21
+layer at (248,466) size 25x24
+  RenderButton {INPUT} at (191,156) size 25x24
+layer at (272,466) size 25x24
+  RenderButton {INPUT} at (215,156) size 25x24
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.txt
index 7594807..7c9d6efb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.txt
@@ -1,21 +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: " "

-        RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]

-        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: " "

-        RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]

-        RenderBR {BR} at (492,368) size 0x0

+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/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e2a3109..917e805 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -619,44 +619,28 @@ BUG13907 WIN : LayoutTests/http/tests/media/video-play-stall.html = FAIL
 BUG13907 WIN : LayoutTests/http/tests/media/video-seekable-stall.html = FAIL
 BUG13907 WIN : LayoutTests/media/audio-constructor-src.html = FAIL
 BUG13907 WIN : LayoutTests/media/audio-constructor.html = FAIL
-BUG13907 WIN : LayoutTests/media/audio-controls-rendering.html = PASS FAIL
 // We don't support MP2 audio so skip this test.
 BUG13907 SKIP : LayoutTests/media/audio-mpeg-supported.html = FAIL
 BUG13907 WIN : LayoutTests/media/constructors.html = FAIL
-// This test crashes in release build.
-BUG13907 WIN : LayoutTests/media/video-currentTime.html = PASS CRASH
 // This test is flaky.
 BUG13907 WIN DEBUG : LayoutTests/media/progress-event-total.html = PASS FAIL
-// This test also times out, it is really flaky.
-BUG13907 WIN : LayoutTests/media/remove-from-document.html = PASS FAIL TIMEOUT
-BUG13907 WIN : LayoutTests/media/video-aspect-ratio.html = FAIL
 // This test crashes in debug build not in release build.
 BUG13907 WIN : LayoutTests/media/video-buffered.html = FAIL CRASH
 BUG13907 WIN : LayoutTests/media/video-can-play-type.html = FAIL
 // This test crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-click-dblckick-standalone.html = PASS TIMEOUT CRASH
-// This test crashes in debug build.
-BUG13907 WIN : LayoutTests/media/video-controls.html = PASS CRASH
-// This test crashes in release build.
-BUG13907 WIN : LayoutTests/media/video-controls-rendering.html = FAIL CRASH
-// This test crashes in debug build.
-BUG13907 WIN : LayoutTests/media/video-controls-visible-audio-only.html = PASS CRASH
 // This test sometimes crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-currentTime-set.html = FAIL CRASH
 // This test crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-currentTime-set2.html = PASS FAIL CRASH TIMEOUT
 // This test crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-display-none-crash.html = PASS CRASH
-BUG13907 WIN : LayoutTests/media/video-display-toggle.html = FAIL
-// This test crashes in debug build.
-BUG13907 WIN : LayoutTests/media/video-dom-src.html = PASS CRASH
 // This test is flaky.
 BUG13907 WIN DEBUG : LayoutTests/media/video-dom-autobuffer.html = PASS FAIL
 // This test crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-document-types.html = PASS FAIL CRASH
 // This test times out in release build, it is really flaky.
 BUG13907 WIN : LayoutTests/media/video-error-abort.html = PASS FAIL TIMEOUT
-BUG13907 WIN : LayoutTests/media/video-layer-crash.html = PASS FAIL
 BUG13907 WIN : LayoutTests/media/video-loop.html = FAIL CRASH
 // This test crashes in debug build.
 BUG13907 WIN : LayoutTests/media/video-muted.html = PASS FAIL CRASH TIMEOUT
@@ -687,9 +671,6 @@ BUG13907 WIN DEBUG : LayoutTests/media/video-src.html = PASS FAIL
 BUG13907 WIN DEBUG : LayoutTests/media/video-src-source.html = PASS FAIL
 // Flaky test.
 BUG13907 WIN DEBUG : LayoutTests/media/video-timeupdate-during-playback.html = PASS FAIL
-BUG13907 WIN : LayoutTests/media/video-transformed.html = PASS FAIL
-BUG13907 WIN : LayoutTests/media/video-zoom-controls.html = FAIL
-BUG13907 WIN : LayoutTests/media/video-zoom.html = FAIL
 // This test is very flaky.
 BUG13907 WIN : LayoutTests/media/unsupported-rtsp.html = PASS CRASH