summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 03:23:32 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 03:23:32 +0000
commitc690ff68f65729ee90b47fb9646ee302053d7824 (patch)
tree0bee2ba4f366fbc73b2764fc0cde799d792d5ccf /webkit/data
parent380f186d176e52cdbc54c6ceabfe5d5a7958cfba (diff)
downloadchromium_src-c690ff68f65729ee90b47fb9646ee302053d7824.zip
chromium_src-c690ff68f65729ee90b47fb9646ee302053d7824.tar.gz
chromium_src-c690ff68f65729ee90b47fb9646ee302053d7824.tar.bz2
This CL fixes the document-open.html and window-open.html plugin layout tests. These were landed in webkit
as fixes for bug https://bugs.webkit.org/show_bug.cgi?id=31067 The layout test plugin changes are on similar lines as the version upstream. We need to rebaseline the expectations as the line numbers differ in test shell and dumprendertree. The document-open.html crashes in test_shell as this test causes the existing document to be taken down which takes down the plugin instance and the associated plugin stream. This works in the webkit plugin implementation as they grab a reference on the plugin stream before calling into the plugin to protect from the stream being destroyed. Our fix is on similar lines. Bug=27164 Review URL: http://codereview.chromium.org/393017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/document-open-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/window-open-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/document-open-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/window-open-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/document-open-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/window-open-expected.txt3
6 files changed, 12 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/document-open-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/document-open-expected.txt
new file mode 100644
index 0000000..5c32f92
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/document-open-expected.txt
@@ -0,0 +1 @@
+CONSOLE MESSAGE: line 1: PLUGIN: DOCUMENT OPEN SUCCESS
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/window-open-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/window-open-expected.txt
new file mode 100644
index 0000000..29ee4e7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/plugins/window-open-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 1: PLUGIN: WINDOW OPEN SUCCESS
+
+This tests that window.open invoked by a plugin via NPN_Invoke without a javascript context succeeds.
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/document-open-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/document-open-expected.txt
new file mode 100644
index 0000000..5c32f92
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/document-open-expected.txt
@@ -0,0 +1 @@
+CONSOLE MESSAGE: line 1: PLUGIN: DOCUMENT OPEN SUCCESS
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/window-open-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/window-open-expected.txt
new file mode 100644
index 0000000..29ee4e7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/plugins/window-open-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 1: PLUGIN: WINDOW OPEN SUCCESS
+
+This tests that window.open invoked by a plugin via NPN_Invoke without a javascript context succeeds.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/document-open-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/document-open-expected.txt
new file mode 100644
index 0000000..5c32f92
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/document-open-expected.txt
@@ -0,0 +1 @@
+CONSOLE MESSAGE: line 1: PLUGIN: DOCUMENT OPEN SUCCESS
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/window-open-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/window-open-expected.txt
new file mode 100644
index 0000000..29ee4e7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/window-open-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 1: PLUGIN: WINDOW OPEN SUCCESS
+
+This tests that window.open invoked by a plugin via NPN_Invoke without a javascript context succeeds.