Layout testing for media in mac

BUG=16779
TEST=layout tests: LayoutTests/media

Enable a bunch of media layout tests in mac

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

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

51 files changed, 619 insertions, 29 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt
new file mode 100644
index 0000000..08cc242
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-expected.txt
@@ -0,0 +1,9 @@
+Test that Audio() object loads the resource after src attribute is set and load() is called.
+
+EXPECTED (audio instanceof HTMLAudioElement == 'true') OK
+RUN(audio.load())
+EVENT(loadstart)
+EXPECTED (relativeURL(audio.currentSrc) == 'content/test.oga') OK
+EVENT(load)
+END OF TEST
+
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
new file mode 100644
index 0000000..cf7db37
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
@@ -0,0 +1 @@
+ecbf628b643cb84fcbd8e28e72fe4aba
\ 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
new file mode 100644
index 0000000..8c498d0
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ea4d251
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.txt
@@ -0,0 +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 784x18
+        RenderText {#text} at (0,0) size 153x18
+          text run at (0,0) width 153: "Test controls placement."
+      RenderBlock (anonymous) at (0,34) size 784x118
+        RenderMedia {AUDIO} at (0,0) size 300x32 [bgcolor=#0000FF]
+        RenderBR {BR} at (300,32) size 0x0
+        RenderBR {BR} at (0,32) size 0x18
+        RenderMedia {AUDIO} at (0,50) size 320x32 [bgcolor=#0000FF]
+        RenderBR {BR} at (320,82) size 0x0
+        RenderBR {BR} at (0,82) size 0x18
+        RenderBR {BR} at (0,100) size 0x18
+layer at (8,42) size 300x32
+  RenderBlock (relative positioned) {DIV} at (0,0) size 300x32
+layer at (8,42) size 300x32
+  RenderFlexibleBox (positioned) {DIV} at (0,0) size 300x32 [bgcolor=#00000099]
+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]
+    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)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (274,42) size 34x32
+  RenderButton {INPUT} at (266,0) size 34x32
+layer at (8,92) size 320x32
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x32
+layer at (8,92) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,92) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,142) size 320x100
+  RenderMedia {AUDIO} at (8,142) size 320x100 [bgcolor=#0000FF]
+layer at (8,142) size 320x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
+layer at (8,210) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,68) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    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
new file mode 100644
index 0000000..a65121f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
@@ -0,0 +1 @@
+72457e75388c2dbb1e4c77f0aeac82a0
\ 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
new file mode 100644
index 0000000..6c7f85a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e4036b3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.txt
@@ -0,0 +1,31 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 360x18
+          text run at (0,0) width 360: "Making sure the controller looks ok after a second load()."
+      RenderBlock (anonymous) at (0,34) 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,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,250) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    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-right-click-on-timebar-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-right-click-on-timebar-expected.txt
new file mode 100644
index 0000000..d2a91b4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-right-click-on-timebar-expected.txt
@@ -0,0 +1,7 @@
+Test that right clicking on the timebar does not cause a seek.
+
+RUN(video.autoplay = true)
+RUN(video.src = 'content/test.ogv')
+EVENT(playing)
+END OF TEST
+
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
new file mode 100644
index 0000000..6dd34dd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
@@ -0,0 +1 @@
+84dce9fd59391ac7fdb9cd717e87b843
\ 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
new file mode 100644
index 0000000..7f8c5b5
--- /dev/null
+++ 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
new file mode 100644
index 0000000..090b9be
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.txt
@@ -0,0 +1,31 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x302
+  RenderBlock {HTML} at (0,0) size 800x302
+    RenderBody {BODY} at (8,16) size 784x278
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 226x18
+          text run at (0,0) width 226: "Drawing the controls in strict mode."
+      RenderBlock (anonymous) at (0,34) size 784x244
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,50) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,50) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,258) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    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/media-load-event-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt
new file mode 100644
index 0000000..b2545dc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-load-event-expected.txt
@@ -0,0 +1,20 @@
+Test that media file is not reloaded when an element is inserted into the DOM.
+
+RUN(mediaElement = document.createElement('audio'))
+RUN(mediaElement.src = 'content/test.oga')
+RUN(mediaElement.load())
+
+EVENT(loadstart)
+EVENT(durationchange)
+EVENT(loadeddata)
+EVENT(load)
+EVENT(loadend)
+
+RUN(document.getElementById('parent').appendChild(mediaElement))
+RUN(mediaElement.play())
+
+EVENT(play)
+EVENT(playing)
+
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-startTime-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-startTime-expected.txt
new file mode 100644
index 0000000..bc9d7b7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/media-startTime-expected.txt
@@ -0,0 +1,9 @@
+Test the, so far unused, 'startTime' attribute.
+
+RUN(video.src = 'content/test.ogv')
+EVENT(loadeddata)
+EXPECTED (video.startTime == '0') OK
+RUN(video.startTime = 10)
+EXPECTED (video.startTime == '0') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/progress-event-at-least-one-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/progress-event-at-least-one-expected.txt
new file mode 100644
index 0000000..b0ed7a1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/progress-event-at-least-one-expected.txt
@@ -0,0 +1,14 @@
+Test that at least one 'progress' event is fired before the 'load' event.
+
+RUN(mediaElement = document.createElement('audio'))
+RUN(mediaElement.src = 'content/test.oga')
+RUN(mediaElement.load())
+
+EVENT(loadstart)
+EVENT(durationchange)
+EVENT(loadedmetadata)
+EVENT(loadeddata)
+EVENT(loadend)
+EXPECTED (progressEventCount >= '1') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt
new file mode 100644
index 0000000..8abc557
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-append-source-expected.txt
@@ -0,0 +1,6 @@
+EXPECTED (video.currentSrc == '') OK
+EXPECTED (video.currentSrc == '') OK
+EVENT(load)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.checksum
new file mode 100644
index 0000000..7a95885
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.checksum
@@ -0,0 +1 @@
+ab1ac65b79847763b94a441d8e3fa6ef
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.png
new file mode 100644
index 0000000..a113ff1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.txt
new file mode 100644
index 0000000..faa075a6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-aspect-ratio-expected.txt
@@ -0,0 +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 784x18
+        RenderText {#text} at (0,0) size 623x18
+          text run at (0,0) width 623: "Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size."
+      RenderBlock (anonymous) at (0,34) size 784x480
+        RenderBR {BR} at (320,240) size 0x0
+        RenderBlock {DIV} at (160,240) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderBlock {DIV} at (0,360) size 320x120
+          RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,282) size 160x120
+  RenderVideo {VIDEO} at (0,240) size 160x120
+layer at (168,282) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (328,282) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (8,402) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (168,402) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
+layer at (328,402) size 320x120
+  RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
+layer at (328,402) size 160x120
+  RenderVideo {VIDEO} at (0,0) size 160x120
+layer at (488,402) size 160x120
+  RenderVideo {VIDEO} at (160,0) size 160x120
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
new file mode 100644
index 0000000..978e083
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
@@ -0,0 +1 @@
+3ef34842a7222731149005e3fd128dae
\ 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
new file mode 100644
index 0000000..b4b28df
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b78aba7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.txt
@@ -0,0 +1,70 @@
+layer at (0,0) size 785x762
+  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 769x18
+        RenderText {#text} at (0,0) size 153x18
+          text run at (0,0) width 153: "Test controls placement."
+      RenderBlock {DIV} at (0,34) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,274) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,514) size 769x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,250) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,250) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,282) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,490) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,490) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,522) size 320x240
+  RenderVideo {VIDEO} at (8,522) size 320x240
+layer at (8,522) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,730) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    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
new file mode 100644
index 0000000..d444997
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
@@ -0,0 +1 @@
+e60a8ddac4ac66e449b4c28fea5a123d
\ 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
new file mode 100644
index 0000000..aba0c32
--- /dev/null
+++ 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
new file mode 100644
index 0000000..405ba11
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.txt
@@ -0,0 +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 493x18
+        text run at (0,0) width 493: "This tests that toggling the display property won't make the controls disappear."
+      RenderBR {BR} at (493,14) 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,26) size 320x240
+  RenderVideo {VIDEO} at (0,18) size 320x240
+layer at (8,26) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,234) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+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]
+    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)]
+    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-dom-src-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt
new file mode 100644
index 0000000..8abc557
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-dom-src-expected.txt
@@ -0,0 +1,6 @@
+EXPECTED (video.currentSrc == '') OK
+EXPECTED (video.currentSrc == '') OK
+EVENT(load)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
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
new file mode 100644
index 0000000..8a411fd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.checksum
@@ -0,0 +1 @@
+2c87f086b18bd3e631c96b1db911a717
\ 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
new file mode 100644
index 0000000..afa0ff6
--- /dev/null
+++ 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
new file mode 100644
index 0000000..cbcd9bb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-empty-source-expected.txt
@@ -0,0 +1,29 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 430x18
+          text run at (0,0) width 430: "Slider drawing with no source. The controls should render correctly."
+      RenderBlock (anonymous) at (0,34) 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,42) size 302x152
+  RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
+layer at (9,43) size 300x150
+  RenderBlock (relative positioned) {DIV} at (1,1) size 300x150
+layer at (9,161) size 300x32
+  RenderFlexibleBox (positioned) {DIV} at (0,118) size 300x32 [bgcolor=#00000099]
+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]
+    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)]
+    RenderBlock {DIV} at (3,-5) size 9x29
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt
new file mode 100644
index 0000000..18d6bc3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-error-abort-expected.txt
@@ -0,0 +1,9 @@
+EXPECTED (video.error == 'null') OK
+EVENT(loadstart)
+EVENT(abort)
+EXPECTED (video.error.code == '1') OK
+EVENT(loadstart)
+EVENT(load)
+EXPECTED (video.error == 'null') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.checksum
new file mode 100644
index 0000000..0caa528
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.checksum
@@ -0,0 +1 @@
+9af4915767e8c806f20ad3884c3328ed
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.png
new file mode 100644
index 0000000..0fd3169d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.txt
new file mode 100644
index 0000000..6e81747
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-layer-crash-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 360x18
+          text run at (0,0) width 360: "Test dynamic removal of transformed and reflected video"
+      RenderBlock (anonymous) at (0,34) size 784x338
+        RenderText {#text} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
+        RenderBR {BR} at (4,14) size 0x0
+        RenderText {#text} at (0,160) size 4x18
+          text run at (0,160) width 4: " "
+        RenderBR {BR} at (210,174) size 0x0
+        RenderText {#text} at (0,320) size 4x18
+          text run at (0,320) width 4: " "
+        RenderBR {BR} at (210,334) size 0x0
+layer at (12,60) size 206x156
+  RenderVideo {VIDEO} at (4,18) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,220) size 206x156
+  RenderVideo {VIDEO} at (4,178) size 206x156 [border: (3px solid #FF0000)]
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-load-networkState-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-load-networkState-expected.txt
new file mode 100644
index 0000000..f1cc4069
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-load-networkState-expected.txt
@@ -0,0 +1,17 @@
+Test that setting src to an invalid url triggers load(), which sets networkState to NETWORK_NO_SOURCE. Setting src to a valid url should then trigger the loading events and end up with networkState >= NETWORK_LOADING.
+
+
+EXPECTED (video.networkState == '0') OK
+RUN(video.src = 'bogus/movie.mpg')
+EVENT(loadstart)
+EXPECTED (video.networkState == '4') OK
+
+RUN(video.src = 'content/test.ogv')
+EVENT(loadstart)
+EVENT(loadedmetadata)
+EVENT(loadeddata)
+EVENT(canplay)
+EVENT(canplaythrough)
+EXPECTED (video.networkState >= '2') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt
new file mode 100644
index 0000000..d4240c5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-seek-past-end-paused-expected.txt
@@ -0,0 +1,18 @@
+Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.
+
+RUN(video.src = 'content/test.ogv')
+RUN(video.load())
+
+EVENT(load)
+EXPECTED (video.paused == 'true') OK
+EXPECTED (video.ended == 'false') OK
+RUN(video.play())
+
+EXPECTED (video.paused == 'false') OK
+EXPECTED (mediaElement.currentTime > '0') OK
+
+EXPECTED (mediaElement.currentTime == 'mediaElement.duration') OK
+EXPECTED (video.ended == 'true') OK
+
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-error-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-error-expected.txt
new file mode 100644
index 0000000..60d95e9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-error-expected.txt
@@ -0,0 +1,30 @@
+1. Test that errors fired while evaluating/loading <source> elements are fired at the <source> and not at the <video> element. 
+2. Verifiy that an 'error' event fired while processing/loading a <source> element does not set the media element's 'error' attribute.
+
+EVENT(loadstart)
+EVENT(error) from <source id='missing-src' src=''> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(error) from <source id='bogus-type' src='content/test.mp4'> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(error) from <source id='unsupported-media-query' src='content/test.mp4'> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(error) from <source id='missing-file' src='content/error2.mpeg'> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(error) from <source id='format-error' src='content/unsupported_track.mov'> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(error) from <source id='supported-format-mp4' src='content/test.mp4'> OK
+EXPECTED (video.error == 'null') OK
+
+EVENT(durationchange)
+EVENT(loadeddata)
+
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (video.error == 'null') OK
+
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-expected.txt
new file mode 100644
index 0000000..0fab52d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-expected.txt
@@ -0,0 +1,4 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-expected.txt
new file mode 100644
index 0000000..0fab52d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-expected.txt
@@ -0,0 +1,4 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-params-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-params-expected.txt
new file mode 100644
index 0000000..0fab52d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-source-type-params-expected.txt
@@ -0,0 +1,4 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt
new file mode 100644
index 0000000..d43e688
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-change-expected.txt
@@ -0,0 +1,20 @@
+1. Test that an invalid src attribute fires an error when the file fails to load.
+2. Test that changing src attribute triggers load after a load fails.
+3. Test that changing src does not trigger load once a file is loaded.
+
+
+EVENT(error)
+EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK
+EXPECTED (video.networkState == '4') OK
+EXPECTED (video.error.code == '4') OK
+
+RUN(video.setAttribute('src', 'content/test.ogv'))
+
+EVENT(loadedmetadata)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (isNaN(video.duration) == 'false') OK
+
+RUN(video.setAttribute('src', 'content/silence.mpg'))
+
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-expected.txt
new file mode 100644
index 0000000..0fab52d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-expected.txt
@@ -0,0 +1,4 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-invalid-remove-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-invalid-remove-expected.txt
new file mode 100644
index 0000000..2c58f47
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-invalid-remove-expected.txt
@@ -0,0 +1,17 @@
+
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'bogus.mov') OK
+
+EVENT(error)
+EXPECTED (video.error.code == '4') OK
+RUN(video.removeAttribute('src'))
+
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+
+EVENT(loadedmetadata)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (isNaN(video.duration) == 'false') OK
+
+END OF TEST
+Test that removing invalid 'src' attribute triggers load of <source> elements
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-remove-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-remove-expected.txt
new file mode 100644
index 0000000..0ee03fe
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-remove-expected.txt
@@ -0,0 +1,12 @@
+
+EVENT(loadedmetadata)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (isNaN(video.duration) == 'false') OK
+
+RUN(video.removeAttribute('src'))
+
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+EXPECTED (isNaN(video.duration) == 'false') OK
+
+END OF TEST
+Test that removing valid 'src' attribute DOES NOT trigger load of <source> elements
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-set-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-set-expected.txt
new file mode 100644
index 0000000..42c41c3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-set-expected.txt
@@ -0,0 +1,5 @@
+Test that setting src attribute triggers load
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-source-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-source-expected.txt
new file mode 100644
index 0000000..0fab52d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-src-source-expected.txt
@@ -0,0 +1,4 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.checksum
new file mode 100644
index 0000000..bba0b76
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.checksum
@@ -0,0 +1 @@
+9ff4795e41776d6ba08a83f22e12fa74
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.png
new file mode 100644
index 0000000..8f90d2c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.txt
new file mode 100644
index 0000000..c7915d5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-transformed-expected.txt
@@ -0,0 +1,24 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 217x18
+          text run at (0,0) width 217: "Test painting of transformed video"
+      RenderBlock (anonymous) at (0,34) size 784x480
+        RenderText {#text} at (0,142) size 4x18
+          text run at (0,142) width 4: " "
+        RenderBR {BR} at (210,156) size 0x0
+        RenderText {#text} at (0,302) size 4x18
+          text run at (0,302) width 4: " "
+        RenderBR {BR} at (210,316) size 0x0
+        RenderText {#text} at (0,462) size 4x18
+          text run at (0,462) width 4: " "
+        RenderBR {BR} at (210,476) size 0x0
+layer at (12,42) size 206x156
+  RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,202) size 206x156
+  RenderVideo {VIDEO} at (4,160) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,362) size 206x156
+  RenderVideo {VIDEO} at (4,320) size 206x156 [border: (3px solid #FF0000)]
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.checksum
new file mode 100644
index 0000000..4105496
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.checksum
@@ -0,0 +1 @@
+c09034a98bada21480c188e8acdc09db
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.png
new file mode 100644
index 0000000..3d8766b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.txt
new file mode 100644
index 0000000..025934ac
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-zoom-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 785x844
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x844
+  RenderBlock {HTML} at (0,0) size 785x844
+    RenderBody {BODY} at (8,8) size 769x828
+      RenderBlock {P} at (0,0) size 769x18
+        RenderText {#text} at (0,0) size 283x18
+          text run at (0,0) width 283: "150% zoom, with width and height attributes"
+      RenderBlock (anonymous) at (0,34) size 769x372
+        RenderText {#text} at (0,354) size 4x18
+          text run at (0,354) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+      RenderBlock {P} at (0,422) size 769x18
+        RenderText {#text} at (0,0) size 303x18
+          text run at (0,0) width 303: "150% zoom, without width and height attributes"
+      RenderBlock (anonymous) at (0,456) size 769x372
+        RenderText {#text} at (0,354) size 4x18
+          text run at (0,354) width 4: " "
+        RenderBR {BR} at (492,368) size 0x0
+layer at (12,42) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (12,464) size 488x368
+  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2d688dc..786c94c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -702,40 +702,38 @@ BUG1124568 : LayoutTests/fast/dom/Window/window-function-name-getter-precedence.
 // These tests are disabled until <audio> and <video> tags are supported.
 // Disable <video> and <audio> tests for mac and linux until there is
 // proper support.
-BUG4363 MAC SKIP : LayoutTests/media = TIMEOUT
 BUG4363 LINUX MAC SKIP : LayoutTests/fast/media = PASS FAIL
 BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/media = FAIL
 BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-poster-from-remote.html = FAIL TIMEOUT
 BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-src-from-remote.html = PASS FAIL
-BUG16779 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT
-
+BUG13907 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT
 BUG13907 SKIP : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/http/tests/media/remove-while-loading.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/http/tests/media/video-play-stall-seek.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/http/tests/media/video-play-stall.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/http/tests/media/video-seekable-stall.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/audio-delete-while-step-button-clicked.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-canvas-source.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-controls-transformed.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-currentTime-set.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-loop.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-played-collapse.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-played-ranges-1.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-played-reset.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-zoom-controls.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/audio-constructor-src.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/audio-play-event.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/controls-drag-timebar.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/video-no-audio.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/video-source-add-src.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = PASS FAIL CRASH
-BUG13907 WIN LINUX MAC LINUX : LayoutTests/fast/layers/video-layer.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/event-attributes.html = TIMEOUT
-BUG13907 WIN LINUX : LayoutTests/media/controls-styling.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-seek-past-end-playing.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-error-abort.html = FAIL
-BUG13907 WIN LINUX : LayoutTests/media/video-play-pause-events.html = TIMEOUT PASS
+BUG13907 : LayoutTests/http/tests/media/remove-while-loading.html = FAIL
+BUG13907 : LayoutTests/http/tests/media/video-play-stall-seek.html = FAIL
+BUG13907 : LayoutTests/http/tests/media/video-play-stall.html = FAIL
+BUG13907 : LayoutTests/http/tests/media/video-seekable-stall.html = FAIL
+BUG13907 : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
+BUG13907 : LayoutTests/media/audio-delete-while-step-button-clicked.html = FAIL
+BUG13907 : LayoutTests/media/video-canvas-source.html = FAIL
+BUG13907 : LayoutTests/media/video-controls-transformed.html = FAIL
+BUG13907 : LayoutTests/media/video-currentTime-set.html = FAIL
+BUG13907 : LayoutTests/media/video-loop.html = FAIL
+BUG13907 : LayoutTests/media/video-played-collapse.html = FAIL
+BUG13907 : LayoutTests/media/video-played-ranges-1.html = FAIL
+BUG13907 : LayoutTests/media/video-played-reset.html = FAIL
+BUG13907 : LayoutTests/media/video-play-pause-events.html = TIMEOUT PASS
+BUG13907 : LayoutTests/media/video-zoom-controls.html = FAIL
+BUG13907 : LayoutTests/media/audio-constructor-src.html = TIMEOUT
+BUG13907 : LayoutTests/media/audio-play-event.html = TIMEOUT
+BUG13907 : LayoutTests/media/controls-drag-timebar.html = TIMEOUT
+BUG13907 : LayoutTests/media/video-no-audio.html = TIMEOUT
+BUG13907 : LayoutTests/media/video-source-add-src.html = TIMEOUT
+BUG13907 : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = PASS FAIL CRASH
+BUG13907 : LayoutTests/fast/layers/video-layer.html = FAIL
+BUG13907 : LayoutTests/media/event-attributes.html = TIMEOUT
+BUG13907 : LayoutTests/media/controls-styling.html = FAIL
+BUG13907 : LayoutTests/media/video-seek-past-end-playing.html = FAIL
+BUG13907 : LayoutTests/media/video-error-abort.html = FAIL
 
 // These tests are WONTFIX because they uess codecs chromium doesn't support.
 BUG16779 WONTFIX SKIP : LayoutTests/media/video-can-play-type.html = FAIL TIMEOUT