summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt15
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-preload-expected.txt15
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt15
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-preload-expected.txt15
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
6 files changed, 34 insertions, 31 deletions
diff --git a/DEPS b/DEPS
index 3ef4144..3f1fe9b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55462",
+ "webkit_revision": "55506",
"ffmpeg_revision": "40586",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt
deleted file mode 100644
index d0de237..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Test that Audio() sets 'autobuffer' attribute.
-
-RUN(mediaElement = new Audio())
-
-++ Test initial attribute value
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-
-RUN(mediaElement.src = 'content/test.oga')
-RUN(mediaElement.load())
-
-++ Test after 'canplaythrough' event
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-preload-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-preload-expected.txt
new file mode 100644
index 0000000..5ab5fb4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-constructor-preload-expected.txt
@@ -0,0 +1,15 @@
+Test that Audio() sets 'preload' attribute.
+
+RUN(mediaElement = new Audio())
+
+++ Test initial attribute value
+EXPECTED (mediaElement.getAttribute('preload') == 'auto') OK
+EXPECTED (mediaElement.preload == 'auto') OK
+
+RUN(mediaElement.src = 'content/test.oga')
+RUN(mediaElement.load())
+
+++ Test after 'canplaythrough' event
+EXPECTED (mediaElement.getAttribute('preload') == 'auto') OK
+EXPECTED (mediaElement.preload == 'auto') OK
+END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt
deleted file mode 100644
index d0de237..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-autobuffer-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Test that Audio() sets 'autobuffer' attribute.
-
-RUN(mediaElement = new Audio())
-
-++ Test initial attribute value
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-
-RUN(mediaElement.src = 'content/test.oga')
-RUN(mediaElement.load())
-
-++ Test after 'canplaythrough' event
-EXPECTED (mediaElement.getAttribute('autobuffer') != 'null') OK
-EXPECTED (mediaElement.autobuffer == 'true') OK
-END OF TEST
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-preload-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-preload-expected.txt
new file mode 100644
index 0000000..5ab5fb4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/audio-constructor-preload-expected.txt
@@ -0,0 +1,15 @@
+Test that Audio() sets 'preload' attribute.
+
+RUN(mediaElement = new Audio())
+
+++ Test initial attribute value
+EXPECTED (mediaElement.getAttribute('preload') == 'auto') OK
+EXPECTED (mediaElement.preload == 'auto') OK
+
+RUN(mediaElement.src = 'content/test.oga')
+RUN(mediaElement.load())
+
+++ Test after 'canplaythrough' event
+EXPECTED (mediaElement.getAttribute('preload') == 'auto') OK
+EXPECTED (mediaElement.preload == 'auto') OK
+END OF TEST
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 96a253e..2d47fbb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -203,6 +203,9 @@ WONTFIX SKIP : webarchive/adopt-attribute-styled-body-webarchive.html = FAIL
WONTFIX SKIP : webarchive/adopt-attribute-styled-node-webarchive.html = FAIL
WONTFIX SKIP : webarchive/adopt-inline-styled-node-webarchive.html = FAIL
+// Chrome does not support Java LiveConnect.
+WONTFIX SKIP : java/lc3 = TEXT
+
// -----------------------------------------------------------------
// WONTFIX TESTS
// -----------------------------------------------------------------