Skip to content

Commit a866d24

Browse files
author
[email protected]
committed
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. Source/WebKit: 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263248 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 9881055 commit a866d24

13 files changed

+60
-31
lines changed

‎ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-06-18 Tim Horton <[email protected]>
2+
3+
Remove some vestiges of the 32-bit Plugin Process
4+
https://bugs.webkit.org/show_bug.cgi?id=213361
5+
6+
Reviewed by Dan Bernstein.
7+
8+
* Makefile.shared:
9+
This hack from r203348 is no longer needed, because WebKit cannot be built for 32-bit anymore.
10+
111
2020-06-17 Michael Catanzaro <[email protected]>
212

313
REGRESSION(r260760): ENABLE_GRAPHICS_CONTEXT_GL should be ON, not TRUE

‎Makefile.shared

-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ ifneq (,$(ARCHS))
2424
else
2525
XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
2626
XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
27-
# Make Plugin.32 and Plugin.64 build even when they can't be built for the specified architecture.
28-
ifeq ($(ARCHS),i386)
29-
XCODE_OPTIONS += VALID_ARCHS=i386
30-
endif
31-
ifeq ($(ARCHS),x86_64)
32-
XCODE_OPTIONS += VALID_ARCHS=x86_64
33-
endif
3427
endif
3528
endif
3629

‎Source/WebKit/ChangeLog

+35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
2020-06-18 Tim Horton <[email protected]>
2+
3+
Remove some vestiges of the 32-bit Plugin Process
4+
https://bugs.webkit.org/show_bug.cgi?id=213361
5+
6+
Reviewed by Dan Bernstein.
7+
8+
We haven't launched 32-bit plugins for a while, but there are some
9+
build system complications and random references in the code that we can get rid of.
10+
11+
* WebKit.xcodeproj/project.pbxproj:
12+
* Configurations/PluginService.xcconfig: Renamed from Source/WebKit/Configurations/PluginService.64.xcconfig.
13+
No need for .64 in the name anymore, since it's the only one.
14+
We do have to leave the .64 in the product name because there are other things in the system that depend on this.
15+
16+
* PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist: Renamed from Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist.
17+
No need for .64 in the name anymore.
18+
19+
* UIProcess/AuxiliaryProcessProxy.cpp:
20+
(WebKit::AuxiliaryProcessProxy::getLaunchOptions):
21+
* UIProcess/Launcher/ProcessLauncher.h:
22+
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
23+
(WebKit::serviceName):
24+
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
25+
(WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes):
26+
There need only be one ProcessType for the plugin process now!
27+
28+
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
29+
(WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes):
30+
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
31+
(WebKit::bubblewrapSpawn):
32+
* UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
33+
(WebKit::ProcessLauncher::launchProcess):
34+
GTK WebKit appears to also only launch 64-bit plugin processes.
35+
136
2020-06-18 Megan Gardner <[email protected]>
237

338
Workaround for UIKit layout bug in time picker.

‎Source/WebKit/Configurations/PluginService.64.xcconfig ‎Source/WebKit/Configurations/PluginService.xcconfig

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323

2424
#include "BaseXPCService.xcconfig"
2525

26-
VALID_ARCHS_macosx_NO = x86_64;
27-
2826
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
2927
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
30-
INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist;
28+
INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist;
3129

3230
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
3331
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;

‎Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist ‎Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.Info.plist

File renamed without changes.

‎Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
7272
varname = "WEB_PROCESS_CMD_PREFIX";
7373
break;
7474
#if ENABLE(NETSCAPE_PLUGIN_API)
75-
case ProcessLauncher::ProcessType::Plugin64:
76-
case ProcessLauncher::ProcessType::Plugin32:
75+
case ProcessLauncher::ProcessType::Plugin:
7776
varname = "PLUGIN_PROCESS_CMD_PREFIX";
7877
break;
7978
#endif

‎Source/WebKit/UIProcess/Launcher/ProcessLauncher.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ class ProcessLauncher : public ThreadSafeRefCounted<ProcessLauncher>, public Can
6262
enum class ProcessType {
6363
Web,
6464
#if ENABLE(NETSCAPE_PLUGIN_API)
65-
Plugin32,
66-
Plugin64,
65+
Plugin,
6766
#endif
6867
Network,
6968
#if ENABLE(GPU_PROCESS)

‎Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,7 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
700700
#if ENABLE(NETSCAPE_PLUGIN_API)
701701
// It is impossible to know what access arbitrary plugins need and since it is for legacy
702702
// reasons lets just leave it unsandboxed.
703-
if (launchOptions.processType == ProcessLauncher::ProcessType::Plugin64
704-
|| launchOptions.processType == ProcessLauncher::ProcessType::Plugin32)
703+
if (launchOptions.processType == ProcessLauncher::ProcessType::Plugin)
705704
return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
706705
#endif
707706

‎Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ void ProcessLauncher::launchProcess()
120120
executablePath = executablePathOfWebProcess();
121121
break;
122122
#if ENABLE(NETSCAPE_PLUGIN_API)
123-
case ProcessLauncher::ProcessType::Plugin64:
124-
case ProcessLauncher::ProcessType::Plugin32:
123+
case ProcessLauncher::ProcessType::Plugin:
125124
executablePath = executablePathOfPluginProcess();
126125
pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
127126
realPluginPath = FileSystem::fileSystemRepresentation(pluginPath);

‎Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

+1-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@
6161
return "com.apple.WebKit.GPU";
6262
#endif
6363
#if ENABLE(NETSCAPE_PLUGIN_API)
64-
case ProcessLauncher::ProcessType::Plugin32:
65-
ASSERT_NOT_REACHED();
66-
return nullptr;
67-
case ProcessLauncher::ProcessType::Plugin64:
64+
case ProcessLauncher::ProcessType::Plugin:
6865
return "com.apple.WebKit.Plugin.64";
6966
#endif
7067
}

‎Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ - (BOOL)_wantsUserAttention
6262
void PluginProcessProxy::platformGetLaunchOptionsWithAttributes(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
6363
{
6464
ASSERT(pluginProcessAttributes.moduleInfo.pluginArchitecture == CPU_TYPE_X86_64);
65-
launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
65+
launchOptions.processType = ProcessLauncher::ProcessType::Plugin;
6666

6767
launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
6868

‎Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ using namespace WebCore;
5252

5353
void PluginProcessProxy::platformGetLaunchOptionsWithAttributes(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
5454
{
55-
launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
55+
launchOptions.processType = ProcessLauncher::ProcessType::Plugin;
5656
launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
5757
}
5858

‎Source/WebKit/WebKit.xcodeproj/project.pbxproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -4851,7 +4851,7 @@
48514851
BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.xcconfig; sourceTree = "<group>"; };
48524852
BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Networking.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
48534853
BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginServiceEntryPoint.mm; sourceTree = "<group>"; };
4854-
BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.xcconfig; sourceTree = "<group>"; };
4854+
BC8283F416B4FC5300A278FE /* PluginService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.xcconfig; sourceTree = "<group>"; };
48554855
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; };
48564856
BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
48574857
BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
@@ -4989,7 +4989,7 @@
49894989
BCF69FA11176D01400471A52 /* APINavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = APINavigationData.cpp; path = UIProcess/API/APINavigationData.cpp; sourceTree = SOURCE_ROOT; };
49904990
BCF69FA71176D1CB00471A52 /* WKNavigationDataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDataRef.h; sourceTree = "<group>"; };
49914991
BCF69FA81176D1CB00471A52 /* WKNavigationDataRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNavigationDataRef.cpp; sourceTree = "<group>"; };
4992-
BCFCA89516DE96CB00074069 /* PluginService.64.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PluginService.64.Info.plist; sourceTree = "<group>"; };
4992+
BCFCA89516DE96CB00074069 /* PluginService.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PluginService.Info.plist; sourceTree = "<group>"; };
49934993
BCFD5489132D82680055D816 /* WKErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKErrorCF.cpp; sourceTree = "<group>"; };
49944994
BCFD548A132D82680055D816 /* WKErrorCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorCF.h; sourceTree = "<group>"; };
49954995
BFA6179E12F0B99D0033E0CA /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewPrivate.h; sourceTree = "<group>"; };
@@ -5835,7 +5835,7 @@
58355835
2D9FB22A237523FB0049F936 /* GPUService.xcconfig */,
58365836
BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
58375837
A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
5838-
BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
5838+
BC8283F416B4FC5300A278FE /* PluginService.xcconfig */,
58395839
37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
58405840
A1B89B92221E023300EB4CEA /* SDKVariant.xcconfig */,
58415841
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
@@ -9709,7 +9709,7 @@
97099709
BC8283E916B4F8E200A278FE /* PluginService */ = {
97109710
isa = PBXGroup;
97119711
children = (
9712-
BCFCA89516DE96CB00074069 /* PluginService.64.Info.plist */,
9712+
BCFCA89516DE96CB00074069 /* PluginService.Info.plist */,
97139713
);
97149714
name = PluginService;
97159715
sourceTree = "<group>";
@@ -13534,21 +13534,21 @@
1353413534
};
1353513535
BC82842B16B4FDF700A278FE /* Debug */ = {
1353613536
isa = XCBuildConfiguration;
13537-
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
13537+
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
1353813538
buildSettings = {
1353913539
};
1354013540
name = Debug;
1354113541
};
1354213542
BC82842C16B4FDF700A278FE /* Release */ = {
1354313543
isa = XCBuildConfiguration;
13544-
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
13544+
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
1354513545
buildSettings = {
1354613546
};
1354713547
name = Release;
1354813548
};
1354913549
BC82842D16B4FDF700A278FE /* Production */ = {
1355013550
isa = XCBuildConfiguration;
13551-
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
13551+
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.xcconfig */;
1355213552
buildSettings = {
1355313553
};
1355413554
name = Production;

0 commit comments

Comments
 (0)