summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 07:57:37 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 07:57:37 +0000
commit135a95591f309ce16b6dc393487ff1d07a855036 (patch)
treeb8b1e56f0a6db4a19ddf10b6b80a08974d56bef9
parent70008ef86aca6cecdb34f509b4ad488f7135d6bc (diff)
downloadchromium_src-135a95591f309ce16b6dc393487ff1d07a855036.zip
chromium_src-135a95591f309ce16b6dc393487ff1d07a855036.tar.gz
chromium_src-135a95591f309ce16b6dc393487ff1d07a855036.tar.bz2
Roll WebKit to 53838.
TEST=none BUG=33045 TBR=darin Review URL: http://codereview.chromium.org/555095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37097 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 700de4b..02fcf25 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53834",
+ "webkit_revision": "53838",
"ffmpeg_revision": "34297",
"skia_revision": "475",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 576dda8..d472957 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3133,3 +3133,6 @@ BUG33045 MAC : svg/custom/missing-xlink.svg = IMAGE
BUG33045 MAC : svg/custom/text-xy-updates-SVGList.xhtml = IMAGE
BUG33045 MAC : tables/mozilla/bugs/bug149275-1.html = IMAGE
BUG33045 MAC : transforms/2d/transform-fixed-container.html = IMAGE
+
+// Added in WebKit 53835
+BUGJORLOW : editing/pasteboard/paste-noscript-xhtml.xhtml = TEXT