summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.pngbin0 -> 5867 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
4 files changed, 6 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index ce5c0bc..cc13da8 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53275",
+ "webkit_revision": "53289",
"ffmpeg_revision": "34297",
"skia_revision": "470",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
new file mode 100644
index 0000000..c4ef812
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
@@ -0,0 +1 @@
+3561d28f3c41f52aeeed2e2f622547b9 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
new file mode 100644
index 0000000..054ab03
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index af107c8..7fb9c47a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3074,4 +3074,8 @@ BUG_ATWILSON WIN LINUX : storage/transaction-error-callback.html = CRASH PASS
BUG_ATWILSON MAC : storage/transaction-error-callback.html = TEXT PASS
BUG_ATWILSON MAC : svg/custom/resource-invalidate-on-target-update.svg = IMAGE PASS
+// Bugs from rolling from 53275:53289
+BUG32305 : fast/loader/onload-willSendRequest-null-for-frame.html = TEXT
+BUG32307 : fast/css/non-standard-checkbox-size.html = IMAGE+TEXT
+
BUG32308 : fast/frames/cached-frame-counter.html = TIMEOUT