Title: [179732] trunk/Source/WebKit2
- Revision
- 179732
- Author
- [email protected]
- Date
- 2015-02-05 17:24:25 -0800 (Thu, 05 Feb 2015)
Log Message
Don't pass architecture to development plug-in XPC services
https://bugs.webkit.org/show_bug.cgi?id=141309
Reviewed by Anders Carlsson.
We now have separate services for 32-bit and 64-bit.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
(WebKit::reexec):
(WebKit::XPCServiceEventHandler):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::connectToReExecService):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179731 => 179732)
--- trunk/Source/WebKit2/ChangeLog 2015-02-06 01:23:31 UTC (rev 179731)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-06 01:24:25 UTC (rev 179732)
@@ -1,3 +1,18 @@
+2015-02-05 Alexey Proskuryakov <[email protected]>
+
+ Don't pass architecture to development plug-in XPC services
+ https://bugs.webkit.org/show_bug.cgi?id=141309
+
+ Reviewed by Anders Carlsson.
+
+ We now have separate services for 32-bit and 64-bit.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+ (WebKit::reexec):
+ (WebKit::XPCServiceEventHandler):
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToReExecService):
+
2015-02-05 Chris Dumez <[email protected]>
Use deleteEmptyDirectory() in NetworkCacheStorage::clear()
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (179731 => 179732)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-02-06 01:23:31 UTC (rev 179731)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-02-06 01:24:25 UTC (rev 179732)
@@ -39,7 +39,6 @@
struct ReexecInfo {
bool executableHeap;
char** environment;
- cpu_type_t cpuType;
};
static NO_RETURN void reexec(ReexecInfo *info)
@@ -65,9 +64,6 @@
posix_spawnattr_setflags(&attr, flags);
- size_t outCount = 0;
- posix_spawnattr_setbinpref_np(&attr, 1, &info->cpuType, &outCount);
-
char path[4 * PATH_MAX];
uint32_t pathLength = sizeof(path);
_NSGetExecutablePath(path, &pathLength);
@@ -107,7 +103,6 @@
ReexecInfo *info = static_cast<ReexecInfo *>(malloc(sizeof(ReexecInfo)));
info->executableHeap = xpc_dictionary_get_bool(event, "executable-heap");
- info->cpuType = (cpu_type_t)xpc_dictionary_get_uint64(event, "architecture");
xpc_object_t environmentArray = xpc_dictionary_get_value(event, "environment");
size_t numberOfEnvironmentVariables = xpc_array_get_count(environmentArray);
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (179731 => 179732)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-02-06 01:23:31 UTC (rev 179731)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-02-06 01:24:25 UTC (rev 179732)
@@ -345,9 +345,6 @@
xpc_object_t reExecMessage = xpc_dictionary_create(0, 0, 0);
xpc_dictionary_set_string(reExecMessage, "message-name", "re-exec");
- cpu_type_t architecture = launchOptions.architecture == ProcessLauncher::LaunchOptions::MatchCurrentArchitecture ? _NSGetMachExecuteHeader()->cputype : launchOptions.architecture;
- xpc_dictionary_set_uint64(reExecMessage, "architecture", (uint64_t)architecture);
-
xpc_object_t environment = xpc_array_create(0, 0);
char** environmentPointer = environmentVariables.environmentPointer();
Vector<CString> temps;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
