summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 06:24:06 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 06:24:06 +0000
commit0ae4fe6245c8143dc05a4f07adc1d9e56a03f1c5 (patch)
tree1e465ac8b66662f59d70bf972440fb36845dddf7
parent291e2b39867888da2c9bc21f03f7fb062ca262a5 (diff)
downloadchromium_src-0ae4fe6245c8143dc05a4f07adc1d9e56a03f1c5.zip
chromium_src-0ae4fe6245c8143dc05a4f07adc1d9e56a03f1c5.tar.gz
chromium_src-0ae4fe6245c8143dc05a4f07adc1d9e56a03f1c5.tar.bz2
Rebaseline of paste-noscript.html.
The diference from the upstream expectation is the first line. Exception messages of V8 and JavaScriptCore are different. BUG=32669 TEST=none Review URL: http://codereview.chromium.org/551092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36738 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-expected.txt20
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-expected.txt20
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt1
3 files changed, 40 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-expected.txt
new file mode 100644
index 0000000..a6099b8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-expected.txt
@@ -0,0 +1,20 @@
+CONSOLE MESSAGE: line 1: Uncaught ReferenceError: sayHello is not defined
+This test copies all the elements containing event handlers and javascript urls, pastes them in an editable area and verifies that no script, handlers or javascript urls are copied.
+Hello
+CNN Hello
+This is a form
+
+Hello 
+CNN Hello 
+This is a form
+
+<button id="button1" onclick="sayHello()" ondblclick="sayHello()" style="width: 100px;">Hello</button>
+<button id="button1" style="width: 100px; ">Hello</button>
+<a id="anchor1" href="http://www.cnn.com">CNN</a>
+<a id="anchor1" href="http://www.cnn.com">CNN</a>
+<a id="anchor2" href="javascript:sayHello()">Hello</a>
+<a id="anchor2" href="">Hello</a>
+<iframe id="iframe1" src="javascript:sayHello()" style="width: 200px; height: 100px; background-color:#cee;"></iframe>
+<iframe id="iframe1" src="" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe>
+<form id="form1" action="javascript:sayHello()" style="width: 200px; height: 150px; background-color:#cee;">This is a form<br><img src="../resources/abe.png"></form>
+<form id="form1" action="" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form<br><img src="../resources/abe.png"></form>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-expected.txt
new file mode 100644
index 0000000..a6099b8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-expected.txt
@@ -0,0 +1,20 @@
+CONSOLE MESSAGE: line 1: Uncaught ReferenceError: sayHello is not defined
+This test copies all the elements containing event handlers and javascript urls, pastes them in an editable area and verifies that no script, handlers or javascript urls are copied.
+Hello
+CNN Hello
+This is a form
+
+Hello 
+CNN Hello 
+This is a form
+
+<button id="button1" onclick="sayHello()" ondblclick="sayHello()" style="width: 100px;">Hello</button>
+<button id="button1" style="width: 100px; ">Hello</button>
+<a id="anchor1" href="http://www.cnn.com">CNN</a>
+<a id="anchor1" href="http://www.cnn.com">CNN</a>
+<a id="anchor2" href="javascript:sayHello()">Hello</a>
+<a id="anchor2" href="">Hello</a>
+<iframe id="iframe1" src="javascript:sayHello()" style="width: 200px; height: 100px; background-color:#cee;"></iframe>
+<iframe id="iframe1" src="" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe>
+<form id="form1" action="javascript:sayHello()" style="width: 200px; height: 150px; background-color:#cee;">This is a form<br><img src="../resources/abe.png"></form>
+<form id="form1" action="" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form<br><img src="../resources/abe.png"></form>
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 201d599..bfe3464 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3017,7 +3017,6 @@ BUG53331 MAC : fast/gradients/border-image-gradient.html = FAIL
BUG53331 : fast/gradients/border-image-gradient-sides-and-corners.html = FAIL
// WebKit roll 53341:53451
-BUG32669 WIN LINUX MAC : editing/pasteboard/paste-noscript.html = TEXT
BUG32670 LINUX : fast/css/zoom-body-scroll.html = TEXT
BUG32671 WIN LINUX MAC : fast/dom/Window/timer-null-script-execution-context.html = TEXT
BUG32672 WIN LINUX : fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2.html = TEXT