Title: [138635] trunk/Source/WebKit2
- Revision
- 138635
- Author
- [email protected]
- Date
- 2013-01-02 12:39:24 -0800 (Wed, 02 Jan 2013)
Log Message
REGRESSION (r138464): Safari hangs when opening Privacy preferences
https://bugs.webkit.org/show_bug.cgi?id=105933
Reviewed by Sam Weinig.
Quick and dirty fix - added a special case for main thread. But I'm not sure if
dispatch_sync on main queue is really the best idiom here.
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
(WebKit::getPluginInfoFromCarbonResources):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138634 => 138635)
--- trunk/Source/WebKit2/ChangeLog 2013-01-02 20:37:53 UTC (rev 138634)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-02 20:39:24 UTC (rev 138635)
@@ -1,3 +1,16 @@
+2013-01-02 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r138464): Safari hangs when opening Privacy preferences
+ https://bugs.webkit.org/show_bug.cgi?id=105933
+
+ Reviewed by Sam Weinig.
+
+ Quick and dirty fix - added a special case for main thread. But I'm not sure if
+ dispatch_sync on main queue is really the best idiom here.
+
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::getPluginInfoFromCarbonResources):
+
2013-01-02 Ryosuke Niwa <[email protected]>
Don't include a header that has been removed in r138413.
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (138634 => 138635)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2013-01-02 20:37:53 UTC (rev 138634)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2013-01-02 20:39:24 UTC (rev 138635)
@@ -354,6 +354,9 @@
static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginModuleInfo& plugin)
{
+ if (isMainThread())
+ return getPluginInfoFromCarbonResourcesOnMainThread(bundle, const_cast<PluginModuleInfo&>(plugin));
+
__block bool gotPluginInfo = false;
dispatch_sync(dispatch_get_main_queue(), ^{
gotPluginInfo = getPluginInfoFromCarbonResourcesOnMainThread(bundle, const_cast<PluginModuleInfo&>(plugin));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
