Changeset 88677 in webkit

Timestamp:

Jun 13, 2011 1:07:53 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-13 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

BankID plug-in isn't instantiated correctly
​https://bugs.webkit.org/show_bug.cgi?id=62588
<rdar://problem/9586600>

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::NetscapePluginModule::determineQuirks): The BankID plug-in uses the QuickDraw drawing model but doesn't draw anything so we can use the half-baked QuickDraw support.

• WebProcess/Plugins/PluginProcessConnection.cpp: (WebKit::defaultSyncMessageTimeout): Don't use a sync message timeout for the BankID plug-in since it sends synchronous Apple Events and we don't want the plug-in to die while it's waiting for a reply.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        BankID plug-in isn't instantiated correctly
+        https://bugs.webkit.org/show_bug.cgi?id=62588
+        <rdar://problem/9586600>
+
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::NetscapePluginModule::determineQuirks):
+        The BankID plug-in uses the QuickDraw drawing model but doesn't draw anything so we can
+        use the half-baked QuickDraw support.
+
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::defaultSyncMessageTimeout):
+        Don't use a sync message timeout for the BankID plug-in since it sends synchronous Apple Events
+        and we don't want the plug-in to die while it's waiting for a reply.
+
 2011-06-13  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -442 +442 @@
         m_pluginQuirks.add(PluginQuirks::AllowHalfBakedQuickDrawSupport);
     }
+
+    if (plugin.bundleIdentifier == "com.jattesaker.macid2.NPPlugin") {
+        // The BankID plug-in uses QuickDraw but doesn't paint or receive events
+        // so we'll allow it to be instantiated even though we don't support QuickDraw.
+        m_pluginQuirks.add(PluginQuirks::AllowHalfBakedQuickDrawSupport);
+    }
 #endif
 }

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

@@ -59 +59 @@
     if (pathGetFileName(pluginPath) == "SharePointBrowserPlugin.plugin")
         return CoreIPC::Connection::NoTimeout;
-    
+
+    // We don't want a message timeout for the BankID plug-in since it can spin a nested
+    // run loop when it's waiting for a reply to an AppleEvent.
+    if (pathGetFileName(pluginPath) == "PersonalPlugin.bundle")
+        return CoreIPC::Connection::NoTimeout;
+
     return syncMessageTimeout;
 }