Enable a bunch of media layout tests

BUG=16779
TEST=layout tests

After a long rewriting of media layout tests, we are able to enable them
again. This change will leave us abotu 19 (out of 98) real failures.

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

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

54 files changed, 602 insertions, 429 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-expected.txt
new file mode 100644
index 0000000..f4752e5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/audio-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-controls-rendering-expected.checksum
index 01dcd36..b453123 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 @@
-967fbec0cdbd2c1a7a9aeb79b7850749
\ No newline at end of file
+cf228708a3fdd68a5f54a21d1bfb2d9f
\ 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 da5bc2a..ca32aba 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 9f9efe0..7e73f95 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,71 +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 784x144
-        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
-        RenderText {#text} at (0,124) size 34x19
-          text run at (0,124) width 34: "FAIL"
-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 (274,44) size 34x32
-  RenderButton {INPUT} at (266,0) size 34x32
-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,52) size 165x23
-  RenderSlider {INPUT} at (6,8) size 165x16 [color=#328CDF] [bgcolor=#FFFFFF14]
-    RenderBlock {DIV} at (2,-6) size 9x29
-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 (294,96) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
-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,104) size 185x23
-  RenderSlider {INPUT} at (6,8) size 185x16 [color=#328CDF] [bgcolor=#FFFFFF14]
-    RenderBlock {DIV} at (2,-6) size 9x29
-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 (294,216) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
-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,224) size 185x23
-  RenderSlider {INPUT} at (6,8) size 185x16 [color=#328CDF] [bgcolor=#FFFFFF14]
-    RenderBlock {DIV} at (2,-6) size 9x29
+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-win/LayoutTests/media/audio-no-installed-engines-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.checksum
new file mode 100644
index 0000000..b21d1da
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.checksum
@@ -0,0 +1 @@
+8c39d0e3ee3da28bbfa63abfd6d6b42e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.png
new file mode 100644
index 0000000..c5cb291
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.txt
new file mode 100644
index 0000000..91418a1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-no-installed-engines-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x600

+  RenderBlock {HTML} at (0,0) size 800x600

+    RenderBody {BODY} at (8,8) size 784x576

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 407x19

+          text run at (0,0) width 407: "PASSED -- crash using Audio with no installed engines bug 27479."

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
new file mode 100644
index 0000000..1126cfc5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-after-reload-expected.checksum
@@ -0,0 +1 @@
+0ad4c886614595b2c994348d68c069ac
\ 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
new file mode 100644
index 0000000..cf57490
--- /dev/null
+++ 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
new file mode 100644
index 0000000..bc7ba19
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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 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-win/LayoutTests/media/controls-right-click-on-timebar-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-right-click-on-timebar-expected.txt
new file mode 100644
index 0000000..ffdfc57
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/controls-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum
new file mode 100644
index 0000000..343bbec
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/controls-strict-expected.checksum
@@ -0,0 +1 @@
+58e63e7e4b220f6bffd305fbdaa4b434
\ 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
new file mode 100644
index 0000000..30b09b7
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ce6ccea
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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 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-win/LayoutTests/media/media-load-event-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-load-event-expected.txt
new file mode 100644
index 0000000..c051166
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/media-startTime-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/media-startTime-expected.txt
new file mode 100644
index 0000000..9b736d0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/progress-event-at-least-one-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/progress-event-at-least-one-expected.txt
new file mode 100644
index 0000000..d8a9be1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-append-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-append-source-expected.txt
new file mode 100644
index 0000000..b8da28a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-aspect-ratio-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.checksum
index 36ad4ab..58c67b2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.checksum
@@ -1 +1 @@
-24bab5e6966683be381cd1f34b91a4f0
\ No newline at end of file
+bd81a2b65ff3aa42226c2831903574fc
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.png
index 05e0f10..b41e2a3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-aspect-ratio-expected.png
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 480bbdf..c9e73f6 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,34 +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
-        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
+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.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-controls-rendering-expected.checksum
index 28a85bc..2518b13 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 @@
-9afc6251e974ecd75adefc4abacb04d0
\ No newline at end of file
+7c151a833462a24e579dd2c9b97ea2f0
\ 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 4379e4d..e0f3761 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 888cba9..39dbe88 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,85 +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,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,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-win/LayoutTests/media/video-currentTime-set-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt
new file mode 100644
index 0000000..91ee776
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-currentTime-set-expected.txt
@@ -0,0 +1,4 @@
+

+Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time

+

+

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 7634c21..567b6de 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 @@
-7e0a3cb915a965daf1bdf042af645ad1
\ No newline at end of file
+834915bb60f14cb735975b3f8354027c
\ 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 62fb584..5e11bd5 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 c309701..871c348 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,35 +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,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,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-win/LayoutTests/media/video-dom-src-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-dom-src-expected.txt
new file mode 100644
index 0000000..b8da28a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-empty-source-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-empty-source-expected.checksum
index 22e4abc..112f174 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 @@
-e6e137d2fc3de608528d283b5bc3b856
\ No newline at end of file
+ed79314122648b7d18590f9b22482d94
\ 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 b310e7a..96036d8 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 7f517cb..fb8dcf1 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
@@ -1,31 +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 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 (275,163) size 34x32
-  RenderButton {INPUT} at (266,0) size 34x32
-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,171) size 165x23
-  RenderSlider {INPUT} at (6,8) size 165x16 [color=#328CDF] [bgcolor=#FFFFFF14]
-    RenderBlock {DIV} at (2,-6) size 9x29
+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

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.checksum
index eada0a7..352575d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.checksum
@@ -1 +1 @@
-4a6330a215be4fb428064a495681288f
\ No newline at end of file
+b14b15296d63344c107290e4aeb1599c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.png
index 87417be..1dce20b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-layer-crash-expected.png
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 28a44d6..b118163 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 206x156

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

+layer at (12,225) size 206x156

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

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-load-networkState-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-load-networkState-expected.txt
new file mode 100644
index 0000000..8a8f2ab
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-seek-past-end-paused-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-seek-past-end-paused-expected.txt
new file mode 100644
index 0000000..641ec41
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-source-error-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-error-expected.txt
new file mode 100644
index 0000000..332aeb2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-expected.txt
new file mode 100644
index 0000000..42a4a7a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-expected.txt
@@ -0,0 +1,3 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-type-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-type-expected.txt
new file mode 100644
index 0000000..439a2fc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-source-type-params-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-source-type-params-expected.txt
new file mode 100644
index 0000000..439a2fc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-src-change-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
index def6d22..2f5faab 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-change-expected.txt
@@ -8,10 +8,10 @@ EXPECTED (relativeURL(video.currentSrc) == 'bogus') OK
 EXPECTED (video.networkState == '4') OK

 EXPECTED (video.error.code == '4') OK

 

-RUN(video.setAttribute('src', 'content/test.mp4'))

+RUN(video.setAttribute('src', 'content/test.ogv'))

 

 EVENT(loadedmetadata)

-EXPECTED (relativeURL(video.currentSrc) == 'content/test.mp4') OK

+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK

 EXPECTED (isNaN(video.duration) == 'false') OK

 

 RUN(video.setAttribute('src', 'content/silence.mpg'))

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-expected.txt
new file mode 100644
index 0000000..42a4a7a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-expected.txt
@@ -0,0 +1,3 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-invalid-remove-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-invalid-remove-expected.txt
new file mode 100644
index 0000000..25e5785
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/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-win/LayoutTests/media/video-src-remove-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-remove-expected.txt
new file mode 100644
index 0000000..9d67461
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-remove-expected.txt
@@ -0,0 +1,11 @@
+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-win/LayoutTests/media/video-src-set-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-set-expected.txt
new file mode 100644
index 0000000..60f8143
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-set-expected.txt
@@ -0,0 +1,4 @@
+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-win/LayoutTests/media/video-src-source-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-source-expected.txt
new file mode 100644
index 0000000..42a4a7a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-src-source-expected.txt
@@ -0,0 +1,3 @@
+EVENT(loadstart)
+EXPECTED (relativeURL(video.currentSrc) == 'content/test.ogv') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.checksum
index fefe646..9f70a42 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.checksum
@@ -1 +1 @@
-e90d2992bd70b922ad2b7dd29c0428ba
\ No newline at end of file
+b910bc7cdc4edb86b15215c5edd49a53
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.png
index caea081..934f11f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-transformed-expected.png
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 bf06a69..ce7923d 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-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.checksum
index 7f0df32..4e5b349 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.checksum
@@ -1 +1 @@
-0515f7676773780155f8a6d634115682
\ No newline at end of file
+1d301e70edd187c12bab4207ba2e9a29
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.png
index 9c5caaa..1e7127f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-zoom-expected.png
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 7c9d6efb..75d875f 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,23 +1,23 @@
-layer at (0,0) size 785x850
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x850
-  RenderBlock {HTML} at (0,0) size 785x850
-    RenderBody {BODY} at (8,8) size 769x834
-      RenderBlock {P} at (0,0) size 769x20
-        RenderText {#text} at (0,0) size 268x19
-          text run at (0,0) width 268: "150% zoom, with width and height attributes"
-      RenderBlock (anonymous) at (0,36) size 769x373
-        RenderText {#text} at (0,353) size 4x19
-          text run at (0,353) width 4: " "
-        RenderBR {BR} at (492,368) size 0x0
-      RenderBlock {P} at (0,425) size 769x20
-        RenderText {#text} at (0,0) size 287x19
-          text run at (0,0) width 287: "150% zoom, without width and height attributes"
-      RenderBlock (anonymous) at (0,461) size 769x373
-        RenderText {#text} at (0,353) size 4x19
-          text run at (0,353) width 4: " "
-        RenderBR {BR} at (492,368) size 0x0
-layer at (12,44) size 488x368
-  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
-layer at (12,469) size 488x368
-  RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+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 2c30f04..9ee21e9 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -716,101 +716,45 @@ BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-poster-from
 BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-source-from-remote.html = PASS FAIL
 BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-src-from-remote.html = PASS FAIL
 
+// Disabling since try bots use Chromium FFmpeg DLLs, which means we can no
+// longer decode WebKit's test clips because they use H.264, AAC, etc.
 // These tests are for <audio> and <video> and they do not run well on Windows.
-BUG13907 WIN SLOW : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL
+BUG16779 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT
 BUG13907 WIN : LayoutTests/http/tests/media/remove-while-loading.html = FAIL
 BUG13907 WIN : LayoutTests/http/tests/media/video-play-stall-seek.html = FAIL
 BUG13907 WIN : LayoutTests/http/tests/media/video-play-stall.html = FAIL
 BUG13907 WIN : LayoutTests/http/tests/media/video-seekable-stall.html = FAIL
-
-// Disabling since try bots use Chromium FFmpeg DLLs, which means we can no
-// longer decode WebKit's test clips because they use H.264, AAC, etc.
-BUG16779 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT
-BUG16779 SKIP : LayoutTests/media/audio-constructor-autobuffer.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = TIMEOUT
-BUG16779 SKIP : LayoutTests/media/audio-delete-while-step-button-clicked.html = TIMEOUT
-BUG16779 SKIP : LayoutTests/media/controls-after-reload.html = TIMEOUT
-BUG16779 SKIP : LayoutTests/media/controls-drag-timebar.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/controls-right-click-on-timebar.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/media-startTime.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/progress-event-total.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/progress-event.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/remove-from-document.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-append-source.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-aspect-ratio.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-autoplay.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-buffered.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-canvas-source.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-click-dblckick-standalone.html = PASS TIMEOUT CRASH
-BUG16779 SKIP : LayoutTests/media/video-controls-transformed.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-controls-zoomed.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-controls.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-currentTime-set.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-currentTime-set2.html = PASS FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-currentTime.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-display-toggle.html = FAIL TIMEOUT CRASH
-BUG16779 SKIP : LayoutTests/media/video-dom-autobuffer.html = PASS FAIL
-BUG16779 SKIP : LayoutTests/media/video-dom-autoplay.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-dom-src.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-error-abort.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-layer-crash.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-load-networkState.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-load-readyState.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-loop.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-muted.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-no-autoplay.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-pause-empty-events.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-play-empty-events.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-played-collapse.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-played-ranges-1.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-played-reset.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-seek-past-end-paused.html = PASS FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-seek-past-end-playing.html = PASS FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-seekable.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-seeking.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-size-intrinsic-scale.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-size.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-source-add-src.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-source-error.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-source-type-params.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-source-type.html = PASS FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-src-change.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-src-invalid-remove.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-timeupdate-during-playback.html = FAIL CRASH TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-transformed.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-volume.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-zoom.html = FAIL
-BUG19779 SKIP : LayoutTests/media/video-no-audio.html = TIMEOUT
-BUG16779 SKIP : LayoutTests/media/audio-constructor-src.html = FAIL
-BUG16779 SKIP : LayoutTests/media/audio-constructor.html = FAIL
-BUG16779 SKIP : LayoutTests/media/media-load-event.html = FAIL
-BUG16779 SKIP : LayoutTests/media/audio-controls-rendering.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-controls-visible-audio-only.html = FAIL
-BUG16779 SKIP : LayoutTests/media/progress-event-at-least-one.html = FAIL TIMEOUT
-BUG16779 SKIP : LayoutTests/media/video-controls-rendering.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-zoom-controls.html = FAIL
-BUG16779 SKIP : LayoutTests/media/video-error-does-not-exist.html = TIMEOUT
-// We don't support MP2 audio so skip this test.
-BUG16779 SKIP : LayoutTests/media/audio-mpeg-supported.html = FAIL
-// audio/3gpp mime type, does not play in Chromium yet.
-BUG16779 SKIP : LayoutTests/media/audio-data-url.html = FAIL
-
-// This test crashes in debug build not in release build.
-BUG13907 WIN : LayoutTests/media/video-can-play-type.html = FAIL
-// This test crashes in debug build.
-BUG13907 WIN DEBUG : LayoutTests/media/video-document-types.html = FAIL CRASH TIMEOUT
-BUG13907 WIN RELEASE : LayoutTests/media/video-document-types.html = PASS FAIL TIMEOUT
-//BUG13907 WIN : LayoutTests/media/video-src-remove.html = FAIL
+BUG13907 WIN SLOW : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL
+BUG13907 WIN : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
+BUG13907 WIN : LayoutTests/media/audio-delete-while-step-button-clicked.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-canvas-source.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-controls-transformed.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-currentTime-set.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-loop.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-played-collapse.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-played-ranges-1.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-played-reset.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-zoom-controls.html = FAIL
+BUG13907 WIN : LayoutTests/media/audio-constructor-src.html = TIMEOUT
+BUG13907 WIN : LayoutTests/media/audio-play-event.html = TIMEOUT
+BUG13907 WIN : LayoutTests/media/controls-drag-timebar.html = TIMEOUT
+BUG13907 WIN : LayoutTests/media/video-no-audio.html = TIMEOUT
+BUG13907 WIN : LayoutTests/media/video-source-add-src.html = TIMEOUT
+BUG13907 WIN : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = PASS FAIL CRASH
+BUG13907 WIN : LayoutTests/fast/layers/video-layer.html = FAIL
+BUG13907 WIN : LayoutTests/media/event-attributes.html = TIMEOUT
 BUG13907 WIN : LayoutTests/media/controls-styling.html = FAIL
-BUG13907 SKIP : LayoutTests/media/controls-strict.html = FAIL
-BUG17397 SKIP WIN : LayoutTests/media/audio-no-installed-engines.html = FAIL
+BUG13907 WIN : LayoutTests/media/video-seek-past-end-playing.html = FAIL
 
 // Very flakey after r24022. Not sure if because of that change though.
 BUG20004 WIN : LayoutTests/media/video-play-pause-events.html = TIMEOUT PASS
 
-BUG13907 SKIP : LayoutTests/media/video-empty-source.html = TIMEOUT
-BUG13907 : LayoutTests/fast/layers/video-layer.html = FAIL
-BUG13907 WIN : LayoutTests/media/event-attributes.html = TIMEOUT
+// These tests are WONTFIX because they uess codecs chromium doesn't support.
+BUG16779 WONTFIX SKIP : LayoutTests/media/video-can-play-type.html = FAIL TIMEOUT
+BUG16779 WONTFIX SKIP : LayoutTests/media/video-document-types.html = FAIL TIMEOUT
+BUG16779 WONTFIX SKIP : LayoutTests/media/audio-mpeg-supported.html = FAIL TIMEOUT
+BUG16779 WONTFIX SKIP : LayoutTests/media/audio-data-url.html = FAIL TIMEOUT
+BUG16779 WONTFIX SKIP : LayoutTests/media/video-size-intrinsic-scale.html = FAIL TIMEOUT
 
 // Crash on Mac and Linux. Need investigation.
 BUG_JIANLI MAC LINUX : LayoutTests/fast/events/drag-to-navigate.html = TIMEOUT CRASH
@@ -2225,11 +2169,6 @@ BUG20341 : LayoutTests/loader/go-back-to-different-window-size.html = TIMEOUT
 // WebKit 47777:47790 - getOwnPropertyDescriptor
 BUG20345 : LayoutTests/fast/js/getOwnPropertyDescriptor.html = FAIL
 
-// WebKit 47797:47804
-BUG20376 WIN : LayoutTests/media/audio-play-event.html = TIMEOUT
-// Was marked as flakey above (I commented it out).
-BUG20376 WIN : LayoutTests/media/video-src-remove.html = TIMEOUT FAIL
-
 // This newly added test times out on Mac:
 BUG20438 MAC : chrome/plugins/get-url-with-iframe-target.html = TIMEOUT
 BUG20438 MAC : chrome/plugins/get-url-with-iframe-target-no-crash.html = TIMEOUT
@@ -2322,10 +2261,6 @@ BUG22526 : LayoutTests/http/tests/security/xss-DENIED-defineProperty.html = TIME
 BUG22549 WIN LINUX : LayoutTests/fast/overflow/position-fixed-transform-clipping.html = FAIL
 
 // WebKit merge 48500:48585, likely due to a video reload crash fix.
-BUG22550 WIN : LayoutTests/media/video-source.html = FAIL
-BUG22550 WIN : LayoutTests/media/video-src-set.html = FAIL
-BUG22550 WIN : LayoutTests/media/video-src-source.html = FAIL
-BUG22550 WIN : LayoutTests/media/video-src.html = FAIL
 
 // WebKit merge 48500:48585, likely due to a fix for file select drag.
 BUG22552 MAC LINUX : LayoutTests/fast/events/drag-in-frames.html = CRASH