Diff
Modified: trunk/ChangeLog (263247 => 263248)
--- trunk/ChangeLog 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/ChangeLog 2020-06-19 00:37:56 UTC (rev 263248)
@@ -1,3 +1,13 @@
+2020-06-18 Tim Horton <timothy_hor...@apple.com>
+
+ Remove some vestiges of the 32-bit Plugin Process
+ https://bugs.webkit.org/show_bug.cgi?id=213361
+
+ Reviewed by Dan Bernstein.
+
+ * Makefile.shared:
+ This hack from r203348 is no longer needed, because WebKit cannot be built for 32-bit anymore.
+
2020-06-17 Michael Catanzaro <mcatanz...@gnome.org>
REGRESSION(r260760): ENABLE_GRAPHICS_CONTEXT_GL should be ON, not TRUE
Modified: trunk/Makefile.shared (263247 => 263248)
--- trunk/Makefile.shared 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Makefile.shared 2020-06-19 00:37:56 UTC (rev 263248)
@@ -24,13 +24,6 @@
else
XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
XCODE_OPTIONS += _ONLY_ACTIVE_ARCH_=NO
- # Make Plugin.32 and Plugin.64 build even when they can't be built for the specified architecture.
- ifeq ($(ARCHS),i386)
- XCODE_OPTIONS += VALID_ARCHS=i386
- endif
- ifeq ($(ARCHS),x86_64)
- XCODE_OPTIONS += VALID_ARCHS=x86_64
- endif
endif
endif
Modified: trunk/Source/WebKit/ChangeLog (263247 => 263248)
--- trunk/Source/WebKit/ChangeLog 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/ChangeLog 2020-06-19 00:37:56 UTC (rev 263248)
@@ -1,3 +1,38 @@
+2020-06-18 Tim Horton <timothy_hor...@apple.com>
+
+ Remove some vestiges of the 32-bit Plugin Process
+ https://bugs.webkit.org/show_bug.cgi?id=213361
+
+ Reviewed by Dan Bernstein.
+
+ We haven't launched 32-bit plugins for a while, but there are some
+ build system complications and random references in the code that we can get rid of.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ * Configurations/PluginService.xcconfig: Renamed from Source/WebKit/Configurations/PluginService.64.xcconfig.
+ No need for .64 in the name anymore, since it's the only one.
+ We do have to leave the .64 in the product name because there are other things in the system that depend on this.
+
+ * PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist: Renamed from Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist.
+ No need for .64 in the name anymore.
+
+ * UIProcess/AuxiliaryProcessProxy.cpp:
+ (WebKit::AuxiliaryProcessProxy::getLaunchOptions):
+ * UIProcess/Launcher/ProcessLauncher.h:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::serviceName):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes):
+ There need only be one ProcessType for the plugin process now!
+
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes):
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bubblewrapSpawn):
+ * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ GTK WebKit appears to also only launch 64-bit plugin processes.
+
2020-06-18 Megan Gardner <megan_gard...@apple.com>
Workaround for UIKit layout bug in time picker.
Deleted: trunk/Source/WebKit/Configurations/PluginService.64.xcconfig (263247 => 263248)
--- trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2020-06-19 00:37:56 UTC (rev 263248)
@@ -1,45 +0,0 @@
-// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-VALID_ARCHS_macosx_NO = x86_64;
-
-PRODUCT_NAME = com.apple.WebKit.Plugin.64;
-PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist;
-
-WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
-
-OTHER_LDFLAGS = $(inherited) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS[sdk=macosx*] = --entitlements $(WK_PROCESSED_XCENT_FILE);
-
-SKIP_INSTALL[sdk=iphone*] = YES;
-
-ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Copied: trunk/Source/WebKit/Configurations/PluginService.xcconfig (from rev 263245, trunk/Source/WebKit/Configurations/PluginService.64.xcconfig) (0 => 263248)
--- trunk/Source/WebKit/Configurations/PluginService.xcconfig (rev 0)
+++ trunk/Source/WebKit/Configurations/PluginService.xcconfig 2020-06-19 00:37:56 UTC (rev 263248)
@@ -0,0 +1,43 @@
+// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "BaseXPCService.xcconfig"
+
+PRODUCT_NAME = com.apple.WebKit.Plugin.64;
+PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
+INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist;
+
+WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+
+OTHER_LDFLAGS = $(inherited) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+
+WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS[sdk=macosx*] = --entitlements $(WK_PROCESSED_XCENT_FILE);
+
+SKIP_INSTALL[sdk=iphone*] = YES;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Deleted: trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist (263247 => 263248)
--- trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist 2020-06-19 00:37:56 UTC (rev 263248)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2020 Apple Inc.</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIdentifier</key>
- <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundlePackageType</key>
- <string>XPC!</string>
- <key>CFBundleShortVersionString</key>
- <string>${SHORT_VERSION_STRING}</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>${BUNDLE_VERSION}</string>
- <key>LSFileQuarantineEnabled</key>
- <false/>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>LSUIElement</key>
- <true/>
- <key>NSSupportsAutomaticGraphicsSwitching</key>
- <true/>
- <key>NSSupportsAppNap</key>
- <true/>
- <key>XPCService</key>
- <dict>
- <key>ServiceType</key>
- <string>Application</string>
- <key>RunLoopType</key>
- <string>_NSApplicationMain</string>
- <key>JoinExistingSession</key>
- <true/>
- <key>_MultipleInstances</key>
- <true/>
- <key>_AbandonCoalition</key>
- <true/>
- <key>_HighBitsASLR</key>
- <true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>NSStringDisableTagged</key>
- <string>YES</string>
- </dict>
- </dict>
-</dict>
-</plist>
Copied: trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist (from rev 263245, trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist) (0 => 263248)
--- trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist (rev 0)
+++ trunk/Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist 2020-06-19 00:37:56 UTC (rev 263248)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2020 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <false/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>NSSupportsAppNap</key>
+ <true/>
+ <key>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>RunLoopType</key>
+ <string>_NSApplicationMain</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>_AbandonCoalition</key>
+ <true/>
+ <key>_HighBitsASLR</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>NSStringDisableTagged</key>
+ <string>YES</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Modified: trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp 2020-06-19 00:37:56 UTC (rev 263248)
@@ -72,8 +72,7 @@
varname = "WEB_PROCESS_CMD_PREFIX";
break;
#if ENABLE(NETSCAPE_PLUGIN_API)
- case ProcessLauncher::ProcessType::Plugin64:
- case ProcessLauncher::ProcessType::Plugin32:
+ case ProcessLauncher::ProcessType::Plugin:
varname = "PLUGIN_PROCESS_CMD_PREFIX";
break;
#endif
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2020-06-19 00:37:56 UTC (rev 263248)
@@ -62,8 +62,7 @@
enum class ProcessType {
Web,
#if ENABLE(NETSCAPE_PLUGIN_API)
- Plugin32,
- Plugin64,
+ Plugin,
#endif
Network,
#if ENABLE(GPU_PROCESS)
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-06-19 00:37:56 UTC (rev 263248)
@@ -700,8 +700,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
// It is impossible to know what access arbitrary plugins need and since it is for legacy
// reasons lets just leave it unsandboxed.
- if (launchOptions.processType == ProcessLauncher::ProcessType::Plugin64
- || launchOptions.processType == ProcessLauncher::ProcessType::Plugin32)
+ if (launchOptions.processType == ProcessLauncher::ProcessType::Plugin)
return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
#endif
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2020-06-19 00:37:56 UTC (rev 263248)
@@ -120,8 +120,7 @@
executablePath = executablePathOfWebProcess();
break;
#if ENABLE(NETSCAPE_PLUGIN_API)
- case ProcessLauncher::ProcessType::Plugin64:
- case ProcessLauncher::ProcessType::Plugin32:
+ case ProcessLauncher::ProcessType::Plugin:
executablePath = executablePathOfPluginProcess();
pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
realPluginPath = FileSystem::fileSystemRepresentation(pluginPath);
Modified: trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2020-06-19 00:37:56 UTC (rev 263248)
@@ -61,10 +61,7 @@
return "com.apple.WebKit.GPU";
#endif
#if ENABLE(NETSCAPE_PLUGIN_API)
- case ProcessLauncher::ProcessType::Plugin32:
- ASSERT_NOT_REACHED();
- return nullptr;
- case ProcessLauncher::ProcessType::Plugin64:
+ case ProcessLauncher::ProcessType::Plugin:
return "com.apple.WebKit.Plugin.64";
#endif
}
Modified: trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2020-06-19 00:37:56 UTC (rev 263248)
@@ -62,7 +62,7 @@
void PluginProcessProxy::platformGetLaunchOptionsWithAttributes(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
{
ASSERT(pluginProcessAttributes.moduleInfo.pluginArchitecture == CPU_TYPE_X86_64);
- launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
+ launchOptions.processType = ProcessLauncher::ProcessType::Plugin;
launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
Modified: trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (263247 => 263248)
--- trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2020-06-19 00:37:56 UTC (rev 263248)
@@ -52,7 +52,7 @@
void PluginProcessProxy::platformGetLaunchOptionsWithAttributes(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
{
- launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
+ launchOptions.processType = ProcessLauncher::ProcessType::Plugin;
launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
}
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (263247 => 263248)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-18 23:42:12 UTC (rev 263247)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-19 00:37:56 UTC (rev 263248)
@@ -4851,7 +4851,7 @@
BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.xcconfig; sourceTree = "<group>"; };
BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Networking.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginServiceEntryPoint.mm; sourceTree = "<group>"; };
- BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.xcconfig; sourceTree = "<group>"; };
+ BC8283F416B4FC5300A278FE /* PluginService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.xcconfig; sourceTree = "<group>"; };
BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
@@ -4989,7 +4989,7 @@
BCF69FA11176D01400471A52 /* APINavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = APINavigationData.cpp; path = UIProcess/API/APINavigationData.cpp; sourceTree = SOURCE_ROOT; };
BCF69FA71176D1CB00471A52 /* WKNavigationDataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDataRef.h; sourceTree = "<group>"; };
BCF69FA81176D1CB00471A52 /* WKNavigationDataRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNavigationDataRef.cpp; sourceTree = "<group>"; };
- BCFCA89516DE96CB00074069 /* PluginService.64.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PluginService.64.Info.plist; sourceTree = "<group>"; };
+ BCFCA89516DE96CB00074069 /* PluginService.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PluginService.Info.plist; sourceTree = "<group>"; };
BCFD5489132D82680055D816 /* WKErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKErrorCF.cpp; sourceTree = "<group>"; };
BCFD548A132D82680055D816 /* WKErrorCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorCF.h; sourceTree = "<group>"; };
BFA6179E12F0B99D0033E0CA /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewPrivate.h; sourceTree = "<group>"; };
@@ -5835,7 +5835,7 @@
2D9FB22A237523FB0049F936 /* GPUService.xcconfig */,
BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
- BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
+ BC8283F416B4FC5300A278FE /* PluginService.xcconfig */,
37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
A1B89B92221E023300EB4CEA /* SDKVariant.xcconfig */,
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
@@ -9709,7 +9709,7 @@
BC8283E916B4F8E200A278FE /* PluginService */ = {
isa = PBXGroup;
children = (
- BCFCA89516DE96CB00074069 /* PluginService.64.Info.plist */,
+ BCFCA89516DE96CB00074069 /* PluginService.Info.plist */,
);
name = PluginService;
sourceTree = "<group>";
@@ -13534,7 +13534,7 @@
};
BC82842B16B4FDF700A278FE /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
+ baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
buildSettings = {
};
name = Debug;
@@ -13541,7 +13541,7 @@
};
BC82842C16B4FDF700A278FE /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
+ baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
buildSettings = {
};
name = Release;
@@ -13548,7 +13548,7 @@
};
BC82842D16B4FDF700A278FE /* Production */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
+ baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
buildSettings = {
};
name = Production;
