Title: [88677] trunk/Source/WebKit2
- Revision
- 88677
- Author
- [email protected]
- Date
- 2011-06-13 13:07:53 -0700 (Mon, 13 Jun 2011)
Log Message
2011-06-13 Anders Carlsson <[email protected]>
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88676 => 88677)
--- trunk/Source/WebKit2/ChangeLog 2011-06-13 20:03:06 UTC (rev 88676)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-13 20:07:53 UTC (rev 88677)
@@ -1,3 +1,21 @@
+2011-06-13 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (88676 => 88677)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-13 20:03:06 UTC (rev 88676)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2011-06-13 20:07:53 UTC (rev 88677)
@@ -441,6 +441,12 @@
// so we'll allow it to be instantiated even though we don't support QuickDraw.
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
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (88676 => 88677)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-13 20:03:06 UTC (rev 88676)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-13 20:07:53 UTC (rev 88677)
@@ -58,7 +58,12 @@
// This way we could check if the plug-in process is actually hung or not.
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
