Title: [143829] trunk/Source/WebKit2
Revision
143829
Author
wei...@apple.com
Date
2013-02-22 19:18:36 -0800 (Fri, 22 Feb 2013)

Log Message

Add temporary work around for 32-bit plugins not working in production builds as XPCServices
https://bugs.webkit.org/show_bug.cgi?id=110680
<rdar://problem/13236883>

Reviewed by Anders Carlsson.

* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::shouldUseXPC):
Temporarily don't use XPC for plug-ins for Safari while we figure out why the
32-bit XPCService is being built universal.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (143828 => 143829)


--- trunk/Source/WebKit2/ChangeLog	2013-02-23 03:14:36 UTC (rev 143828)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-23 03:18:36 UTC (rev 143829)
@@ -1,3 +1,16 @@
+2013-02-22  Sam Weinig  <s...@webkit.org>
+
+        Add temporary work around for 32-bit plugins not working in production builds as XPCServices
+        https://bugs.webkit.org/show_bug.cgi?id=110680
+        <rdar://problem/13236883>
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::shouldUseXPC):
+        Temporarily don't use XPC for plug-ins for Safari while we figure out why the
+        32-bit XPCService is being built universal.
+
 2013-02-22  Tim Horton  <timothy_hor...@apple.com>
 
         [WK2] The root and page overlay layers should be the size of the view, not the content

Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (143828 => 143829)


--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm	2013-02-23 03:14:36 UTC (rev 143828)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm	2013-02-23 03:18:36 UTC (rev 143829)
@@ -33,6 +33,7 @@
 #import "PluginProcessMessages.h"
 #import "WebKitSystemInterface.h"
 #import <WebCore/FileSystem.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <spawn.h>
 #import <wtf/text/CString.h>
 
@@ -124,6 +125,10 @@
         return [value boolValue];
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    // FIXME: Temporary workaround for <rdar://problem/13236883>
+    if (applicationIsSafari())
+        return false;
+
     return true;
 #else
     return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to