Changeset 55415 in webkit

Timestamp:

Mar 2, 2010 10:34:28 AM (14 years ago)

Author:

kov@webkit.org

Message:

2010-03-02 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Alexey Proskuryakov.

Test plugin still has issues with releasing objects, and variants
​https://bugs.webkit.org/show_bug.cgi?id=35587

Fix the conditions for releasing the variants after calling
invoke, and avoid having a number of objects leak.

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: (testDocumentOpen): (testWindowOpen):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-02  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test plugin still has issues with releasing objects, and variants
+        https://bugs.webkit.org/show_bug.cgi?id=35587
+
+        Fix the conditions for releasing the variants after calling
+        invoke, and avoid having a number of objects leak.
+
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
+        (testDocumentOpen):
+        (testWindowOpen):
+
 2010-03-02  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp

@@ -712 +712 @@
     NPVariant docVariant;
     browser->getproperty(npp, windowObject, documentId, &docVariant);
-    if (docVariant.type != NPVariantType_Object)
-        return false;
+    if (docVariant.type != NPVariantType_Object) {
+        browser->releaseobject(windowObject);
+        return false;
+    }
 
     NPObject *documentObject = NPVARIANT_TO_OBJECT(docVariant);
@@ -722 +724 @@
 
     NPVariant result;
-    if (browser->invoke(npp, documentObject, openId, openArgs, 2, &result))
+    if (!browser->invoke(npp, documentObject, openId, openArgs, 2, &result)) {
+        browser->releaseobject(windowObject);
         browser->releaseobject(documentObject);
-
-    if (result.type == NPVariantType_Object) {
-        pluginLogWithWindowObjectVariableArgs(windowObject, npp, "DOCUMENT OPEN SUCCESS");
-        notifyTestCompletion(npp, result.value.objectValue);
-        browser->releaseobject(result.value.objectValue);
-        return true;
-    }
-
-    return false;
+        return false;
+    }
+
+    browser->releaseobject(documentObject);
+
+    if (result.type != NPVariantType_Object) {
+        browser->releaseobject(windowObject);
+        browser->releasevariantvalue(&result);
+        return false;
+    }
+
+    pluginLogWithWindowObjectVariableArgs(windowObject, npp, "DOCUMENT OPEN SUCCESS");
+    notifyTestCompletion(npp, result.value.objectValue);
+    browser->releaseobject(result.value.objectValue);
+    browser->releaseobject(windowObject);
+    return true;
 }
 
@@ -749 +759 @@
 
     NPVariant result;
-    bool didSucceed = browser->invoke(npp, windowObject, openId, openArgs, 2, &result);
-    if (didSucceed && (result.type == NPVariantType_Object)) {
-        pluginLogWithWindowObjectVariableArgs(windowObject, npp, "WINDOW OPEN SUCCESS");
-        notifyTestCompletion(npp, result.value.objectValue);
-        browser->releaseobject(result.value.objectValue);
-        return true;
-    }
-    return false;
+    if (!browser->invoke(npp, windowObject, openId, openArgs, 2, &result)) {
+        browser->releaseobject(windowObject);
+        return false;
+    }
+
+    if (result.type != NPVariantType_Object) {
+        browser->releaseobject(windowObject);
+        browser->releasevariantvalue(&result);
+        return false;
+    }
+
+    pluginLogWithWindowObjectVariableArgs(windowObject, npp, "WINDOW OPEN SUCCESS");
+    notifyTestCompletion(npp, result.value.objectValue);
+    browser->releaseobject(result.value.objectValue);
+    browser->releaseobject(windowObject);
+    return true;
 }