Changeset 70347 in webkit

Timestamp:

Oct 22, 2010 2:58:29 PM (14 years ago)

Author:

andersca@apple.com

Message:

Fix assert when a NetscapePluginModule loses its last NetscapePlugin.
​https://bugs.webkit.org/show_bug.cgi?id=48155

Reviewed by Adam Roben.

(The assert in question is ASSERT(pluginModuleIndex != notFound) in
NetscapePluginModule::shutdown()).

• WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:

(WebKit::NetscapePluginModule::pluginCreated):
If we didn't have any live plug-ins, load the plug-in module.

(WebKit::NetscapePluginModule::pluginDestroyed):
If this was the last plug-in, unload the plug-in module.

(WebKit::NetscapePluginModule::shutdown):
Set m_isInitialized to false.

(WebKit::NetscapePluginModule::load):
Don't do anything if the plug-in module has already been initialized.

(WebKit::NetscapePluginModule::unload):
Assert that we're not initialized.

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:

(WebKit::NetscapePlugin::platformPostInitialize):
Assert that we successfully created the window.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePluginModule.cpp (modified) (5 diffs)
• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Fix assert when a NetscapePluginModule loses its last NetscapePlugin.
+        https://bugs.webkit.org/show_bug.cgi?id=48155
+
+        (The assert in question is ASSERT(pluginModuleIndex != notFound) in 
+        NetscapePluginModule::shutdown()).
+
+        * WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:
+        (WebKit::NetscapePluginModule::pluginCreated):
+        If we didn't have any live plug-ins, load the plug-in module.
+
+        (WebKit::NetscapePluginModule::pluginDestroyed):
+        If this was the last plug-in, unload the plug-in module.
+
+        (WebKit::NetscapePluginModule::shutdown):
+        Set m_isInitialized to false.
+
+        (WebKit::NetscapePluginModule::load):
+        Don't do anything if the plug-in module has already been initialized.
+
+        (WebKit::NetscapePluginModule::unload):
+        Assert that we're not initialized.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformPostInitialize):
+        Assert that we successfully created the window.
+
 2010-10-22  Jessie Berlin  <jberlin@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp

@@ -54 +54 @@
 void NetscapePluginModule::pluginCreated()
 {
+    if (!m_pluginCount) {
+        // Load the plug-in module if necessary.
+        load();
+    }
+        
     m_pluginCount++;
 }
@@ -62 +67 @@
     m_pluginCount--;
     
-    if (!m_pluginCount)
+    if (!m_pluginCount) {
         shutdown();
+        unload();
+    }
 }
 
@@ -71 +78 @@
 
     m_shutdownProcPtr();
+
+    m_isInitialized = false;
 
     size_t pluginModuleIndex = initializedNetscapePluginModules().find(this);
@@ -99 +108 @@
 bool NetscapePluginModule::load()
 {
+    if (m_isInitialized) {
+        ASSERT(initializedNetscapePluginModules().find(this) != notFound);
+        return true;
+    }
+
     if (!tryLoad()) {
         unload();
@@ -149 +163 @@
 void NetscapePluginModule::unload()
 {
+    ASSERT(!m_isInitialized);
+
     m_module = 0;
 }

trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -133 +133 @@
         Rect bounds = { 0, 0, 0, 0 };
         CreateNewWindow(kDocumentWindowClass, 0, &bounds, reinterpret_cast<WindowRef*>(&m_npCGContext.window));
+        ASSERT(m_npCGContext.window);
         
         // FIXME: Disable the backing store.