Changeset 163099 in webkit

Timestamp:

Jan 30, 2014 12:29:12 PM (10 years ago)

Author:

mrowe@apple.com

Message:

Host plug-ins in XPC services
<​https://webkit.org/b/127897> / <rdar://problem/13675955>

We disabled use of XPC services for plug-ins back in r143829 as the per-architecture services
were not being built for the appropriate architectures. Fixing that allows us to reenable them.

Reviewed by Anders Carlsson.

• Configurations/PluginService.32.xcconfig: Use VALID_ARCHS to restrict the service

to building for i386-only in production builds. Non-production builds allow building
for all standard architectures to ensure that Xcode will be able to build this target.
The exact architecture used isn't a concern for non-production builds since we'll use
the development version of the service anyway.

• UIProcess/Plugins/mac/PluginProcessProxyMac.mm:

(WebKit::shouldUseXPC): Remove the workaround that disables use of the XPC services.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/PluginService.32.xcconfig (modified) (1 diff)
• UIProcess/Plugins/mac/PluginProcessProxyMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-30  Mark Rowe  <mrowe@apple.com>
+
+        Host plug-ins in XPC services
+        <https://webkit.org/b/127897> / <rdar://problem/13675955>
+
+        We disabled use of XPC services for plug-ins back in r143829 as the per-architecture services
+        were not being built for the appropriate architectures. Fixing that allows us to reenable them.
+
+        Reviewed by Anders Carlsson.
+
+        * Configurations/PluginService.32.xcconfig: Use VALID_ARCHS to restrict the service
+        to building for i386-only in production builds. Non-production builds allow building
+        for all standard architectures to ensure that Xcode will be able to build this target.
+        The exact architecture used isn't a concern for non-production builds since we'll use
+        the development version of the service anyway.
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::shouldUseXPC): Remove the workaround that disables use of the XPC services.
+
 2014-01-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

@@ -24 +24 @@
 #include "BaseXPCService.xcconfig"
 
-ARCHS = $(ARCHS_$(PLATFORM_NAME));
-ARCHS_macosx = i386;
-ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
-ARCHS_iphonesimulator = $(ARCHS_iphoneos);
+VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
+VALID_ARCHS_macosx = $(VALID_ARCHS_macosx_$(CONFIGURATION));
+VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT);
+VALID_ARCHS_macosx_Release = $(VALID_ARCHS_macosx_Debug);
+VALID_ARCHS_macosx_Production = i386;
+VALID_ARCHS_iphoneos = $(VALID_ARCHS);
+VALID_ARCHS_iphonesimulator = $(VALID_ARCHS_iphoneos);
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.32;

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

@@ -34 +34 @@
 #import "PluginProcessMessages.h"
 #import "WebKitSystemInterface.h"
+#import <QuartzCore/CARemoteLayerServer.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/URL.h>
-#import <WebCore/RuntimeApplicationChecks.h>
 #import <crt_externs.h>
 #import <mach-o/dyld.h>
 #import <spawn.h>
 #import <wtf/text/CString.h>
-
-#import <QuartzCore/CARemoteLayerServer.h>
 
 @interface WKPlaceholderModalWindow : NSWindow 
@@ -130 +128 @@
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    // FIXME: Temporary workaround for <rdar://problem/13236883>
-    if (applicationIsSafari())
-        return false;
-
     return true;
 #else