From 80a179848e2b5bee51fe4364c77f1f402ece1778 Mon Sep 17 00:00:00 2001 From: weinig Date: Tue, 30 Jan 2007 23:24:24 +0000 Subject: [PATCH] LayoutTests: Reviewed by Geoff. - test for http://bugs.webkit.org/show_bug.cgi?id=12050 REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin) * plugins/createScriptableObject-before-start-expected.txt: Added. * plugins/createScriptableObject-before-start.html: Added. WebKit: Reviewed by Geoff. - fix http://bugs.webkit.org/show_bug.cgi?id=12050 REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin) Test: plugins/createScriptableObject-before-start.html * Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView createPluginScriptableObject]): Return NULL if the plugin is not started. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@19275 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 10 +++++++ ...ScriptableObject-before-start-expected.txt | 5 ++++ .../createScriptableObject-before-start.html | 27 +++++++++++++++++++ WebKit/ChangeLog | 13 +++++++++ WebKit/Plugins/WebBaseNetscapePluginView.mm | 2 +- 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 LayoutTests/plugins/createScriptableObject-before-start-expected.txt create mode 100644 LayoutTests/plugins/createScriptableObject-before-start.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 1e838b049b22..1fea45257108 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2007-01-30 Mitz Pettel + + Reviewed by Geoff. + + - test for http://bugs.webkit.org/show_bug.cgi?id=12050 + REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin) + + * plugins/createScriptableObject-before-start-expected.txt: Added. + * plugins/createScriptableObject-before-start.html: Added. + 2007-01-30 Mitz Pettel Reviewed by Darin. diff --git a/LayoutTests/plugins/createScriptableObject-before-start-expected.txt b/LayoutTests/plugins/createScriptableObject-before-start-expected.txt new file mode 100644 index 000000000000..c9eb3cf9041b --- /dev/null +++ b/LayoutTests/plugins/createScriptableObject-before-start-expected.txt @@ -0,0 +1,5 @@ +Test for http://bugs.webkit.org/show_bug.cgi?id=12050 REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin). + +No ASSERT means test PASS. + + diff --git a/LayoutTests/plugins/createScriptableObject-before-start.html b/LayoutTests/plugins/createScriptableObject-before-start.html new file mode 100644 index 000000000000..74c80d2a857c --- /dev/null +++ b/LayoutTests/plugins/createScriptableObject-before-start.html @@ -0,0 +1,27 @@ + + + + + + +

+ Test for http://bugs.webkit.org/show_bug.cgi?id=12050 + REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin). +

+ No ASSERT means test PASS. +

+ + + diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index 51ba0e812cd7..9363af65ebfb 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,16 @@ +2007-01-30 Mitz Pettel + + Reviewed by Geoff. + + - fix http://bugs.webkit.org/show_bug.cgi?id=12050 + REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin) + + Test: plugins/createScriptableObject-before-start.html + + * Plugins/WebBaseNetscapePluginView.mm: + (-[WebBaseNetscapePluginView createPluginScriptableObject]): Return NULL if + the plugin is not started. + 2007-01-30 Maciej Stachowiak Reviewed by Anders. diff --git a/WebKit/Plugins/WebBaseNetscapePluginView.mm b/WebKit/Plugins/WebBaseNetscapePluginView.mm index dc30e1e5eca7..e14282bec42d 100644 --- a/WebKit/Plugins/WebBaseNetscapePluginView.mm +++ b/WebKit/Plugins/WebBaseNetscapePluginView.mm @@ -1766,7 +1766,7 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve - (NPObject *)createPluginScriptableObject { - if (!NPP_GetValue) + if (!NPP_GetValue || ![self isStarted]) return NULL; NPObject *value = NULL; -- 2.36.0