LayoutTests:
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2007 23:24:24 +0000 (23:24 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2007 23:24:24 +0000 (23:24 +0000)
        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
LayoutTests/plugins/createScriptableObject-before-start-expected.txt [new file with mode: 0644]
LayoutTests/plugins/createScriptableObject-before-start.html [new file with mode: 0644]
WebKit/ChangeLog
WebKit/Plugins/WebBaseNetscapePluginView.mm

index 1e838b0..1fea452 100644 (file)
@@ -1,5 +1,15 @@
 2007-01-30  Mitz Pettel  <mitz@webkit.org>
 
+        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  <mitz@webkit.org>
+
         Reviewed by Darin.
 
         - test for http://bugs.webkit.org/show_bug.cgi?id=12487
diff --git a/LayoutTests/plugins/createScriptableObject-before-start-expected.txt b/LayoutTests/plugins/createScriptableObject-before-start-expected.txt
new file mode 100644 (file)
index 0000000..c9eb3cf
--- /dev/null
@@ -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 (file)
index 0000000..74c80d2
--- /dev/null
@@ -0,0 +1,27 @@
+<html>
+<head>
+    <title></title>
+    <script type="text/javascript">
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+    </script>
+</head>
+<body>
+    <p>
+        Test for <i><a href="http://bugs.webkit.org/show_bug.cgi?id=12050">http://bugs.webkit.org/show_bug.cgi?id=12050</a>
+        REGRESSION: Assertion failure in -[WebBaseNetscapePluginView willCallPlugInFunction] (plugin)</i>.
+    </p>
+    <p>
+        No ASSERT means test PASS.
+    </p>
+    <iframe style="display: none;" src='data:text/html,
+        <object id="target" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"></object>
+        <script type="text/javascript">
+            var obj = document.getElementById("target");
+            obj.offsetLeft;
+            obj.anyProperty; 
+        </script>
+    '>
+    </iframe>
+</body>
+</html>
index 51ba0e8..9363af6 100644 (file)
@@ -1,3 +1,16 @@
+2007-01-30  Mitz Pettel  <mitz@webkit.org>
+
+        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  <mjs@apple.com>
 
         Reviewed by Anders.
index dc30e1e..e14282b 100644 (file)
@@ -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;