summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 18:52:42 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 18:52:42 +0000
commit15b8ab04e65ec1347f6b8d75d4b4198ad66bc186 (patch)
tree97bc5c613286cc5557a1e1ddf2d1bd6effa96fe9
parentd8fcf77c1946a7c5eaa8907f50a7e5df163a1a41 (diff)
downloadchromium_src-15b8ab04e65ec1347f6b8d75d4b4198ad66bc186.zip
chromium_src-15b8ab04e65ec1347f6b8d75d4b4198ad66bc186.tar.gz
chromium_src-15b8ab04e65ec1347f6b8d75d4b4198ad66bc186.tar.bz2
WebKit roll to 53083
TBR=atwilson BUG=none TEST=none Review URL: http://codereview.chromium.org/543009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35919 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/kde/RegExp-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/regexp-compile-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/kde/RegExp-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/regexp-compile-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
6 files changed, 18 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index 4e37a94..79edfdf 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53018",
+ "webkit_revision": "53083",
"ffmpeg_revision": "34297",
"skia_revision": "470",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/kde/RegExp-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/kde/RegExp-expected.txt
index bbbf9b6..7f02f2d 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/kde/RegExp-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/kde/RegExp-expected.txt
@@ -92,6 +92,10 @@ PASS /\u0061/.source is '\\u0061'
PASS 'abc'.match(/\u0062/).toString() is 'b'
FAIL Object.prototype.toString.apply(RegExp.prototype) should be [object RegExp]. Was [object Object].
PASS typeof RegExp.prototype.toString() is 'string'
+PASS new RegExp().toString() is '/(?:)/'
+PASS (new RegExp('(?:)')).source is '(?:)'
+PASS /(?:)/.toString() is '/(?:)/'
+PASS /(?:)/.source is '(?:)'
Done.
PASS successfullyParsed is true
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/regexp-compile-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/regexp-compile-expected.txt
index f43f4d1..e952402 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/regexp-compile-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/regexp-compile-expected.txt
@@ -19,7 +19,7 @@ PASS re.toString() is '/c/i'
PASS re.compile(new RegExp('+')); threw exception SyntaxError: Invalid regular expression: /+/: Nothing to repeat.
PASS re.toString() is '/undefined/'
PASS re.toString() is '/null/'
-FAIL re.toString() should be //. Was /(?:)/.
+PASS re.toString() is '/(?:)/'
PASS re.toString() is '/z/'
PASS re.lastIndex is 0
PASS re.lastIndex is 1
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/kde/RegExp-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/kde/RegExp-expected.txt
index bbbf9b6..7f02f2d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/kde/RegExp-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/kde/RegExp-expected.txt
@@ -92,6 +92,10 @@ PASS /\u0061/.source is '\\u0061'
PASS 'abc'.match(/\u0062/).toString() is 'b'
FAIL Object.prototype.toString.apply(RegExp.prototype) should be [object RegExp]. Was [object Object].
PASS typeof RegExp.prototype.toString() is 'string'
+PASS new RegExp().toString() is '/(?:)/'
+PASS (new RegExp('(?:)')).source is '(?:)'
+PASS /(?:)/.toString() is '/(?:)/'
+PASS /(?:)/.source is '(?:)'
Done.
PASS successfullyParsed is true
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/regexp-compile-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/regexp-compile-expected.txt
index f43f4d1..e952402 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/regexp-compile-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/regexp-compile-expected.txt
@@ -19,7 +19,7 @@ PASS re.toString() is '/c/i'
PASS re.compile(new RegExp('+')); threw exception SyntaxError: Invalid regular expression: /+/: Nothing to repeat.
PASS re.toString() is '/undefined/'
PASS re.toString() is '/null/'
-FAIL re.toString() should be //. Was /(?:)/.
+PASS re.toString() is '/(?:)/'
PASS re.toString() is '/z/'
PASS re.lastIndex is 0
PASS re.lastIndex is 1
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index f2f7bb3..338516c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -448,6 +448,10 @@ BUG12310 WONTFIX SKIP : LayoutTests/fast/wcss = FAIL
// because we can't emulate the cahcing behaviors it expects.
WONTFIX : LayoutTests/fast/dom/HTMLScriptElement/nested-execution.html = FAIL
+// Touch events are not supported.
+WONTFIX SKIP : LayoutTests/fast/events/touch-coords-in-zoom-and-scroll.html = FAIL TIMEOUT
+WONTFIX SKIP : LayoutTests/fast/events/basic-touch-events.html = FAIL
+
// -----------------------------------------------------------------
// CHROME REWRITTEN TESTS
// -----------------------------------------------------------------
@@ -3016,9 +3020,6 @@ BUG30174 : LayoutTests/media/video-source-type.html = CRASH PASS
// Flaky.
BUG30180 : LayoutTests/fast/text/international/hindi-whitespace.html = IMAGE PASS
-// New test with http://trac.webkit.org/changeset/51982
-LayoutTests/fast/events/basic-touch-events.html = TEXT
-
// evan's fix rolled out in http://trac.webkit.org/changeset/52071 due to compat issues.
BUG30343 LINUX : LayoutTests/fast/css/large-number-round-trip.html = TEXT
@@ -3139,3 +3140,6 @@ BUG31794 WIN MAC : LayoutTests/storage/domstorage/localstorage/enumerate-storage
// Flaky
BUG31803 LINUX : LayoutTests/editing/inserting/12882.html = IMAGE PASS
+
+
+