summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 02:12:16 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 02:12:16 +0000
commit412df145f11fb172b0427c78673ba753fcb777aa (patch)
tree41a57362fc9de95ab09354376037fbe70b6928dd
parented7310cabaf149bae473e0acf6c2cadec773b8cf (diff)
downloadchromium_src-412df145f11fb172b0427c78673ba753fcb777aa.zip
chromium_src-412df145f11fb172b0427c78673ba753fcb777aa.tar.gz
chromium_src-412df145f11fb172b0427c78673ba753fcb777aa.tar.bz2
Roll WebKit to 53878
TEST=none BUG=33195 TBR=darin Review URL: http://codereview.chromium.org/555117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37213 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 3eafb81..7200fc1 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53869",
+ "webkit_revision": "53877",
"ffmpeg_revision": "34297",
"skia_revision": "475",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
index 286b1aa..d5f7442 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
@@ -4,4 +4,4 @@ This test copies the content of an iframe and pastes it in an editable area in a
HelloCNNHello
This is a form
-<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.cnn.com">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
+<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.bing.com/search?q=cnn">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
index 286b1aa..d5f7442 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
@@ -4,4 +4,4 @@ This test copies the content of an iframe and pastes it in an editable area in a
HelloCNNHello
This is a form
-<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.cnn.com">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
+<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.bing.com/search?q=cnn">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>