2011-01-18 Anders Carlsson <andersca@apple.com>

        Reviewed by Dan Bernstein.

        Plug-in hosting WebProcess instances appear in Activity Monitor as WebProcess
        https://bugs.webkit.org/show_bug.cgi?id=52635
        <rdar://problem/8731337>

        * PluginProcess/PluginProcess.cpp:
        (WebKit::PluginProcess::initialize):
        Call platformInitialize.

        * PluginProcess/PluginProcess.h:
        Add platformInitialize.

        * PluginProcess/mac/PluginProcessMac.mm:
        (WebKit::PluginProcess::platformInitialize):
        Set the compositing render server port and the visible application name.

        * Shared/Plugins/PluginProcessCreationParameters.cpp:
        (WebKit::PluginProcessCreationParameters::encode):
        (WebKit::PluginProcessCreationParameters::decode):
        Encode/decode the parent process name.

        * Shared/Plugins/PluginProcessCreationParameters.h:
        Add parentProcessName.

        * Shared/WebProcessCreationParameters.cpp:
        (WebKit::WebProcessCreationParameters::encode):
        (WebKit::WebProcessCreationParameters::decode):
        Encode/decode the parent process name.

        * Shared/WebProcessCreationParameters.h:
        Add parentProcessName.

        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
        (WebKit::ProcessLauncher::launchProcess):
        Don't pass the parent process name here.

        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
        Set the visible name.

        * UIProcess/mac/WebContextMac.mm:
        (WebKit::WebContext::platformInitializeWebProcess):
        Pass along the parent process name.

        * WebProcess/mac/WebProcessMac.mm:
        (WebKit::WebProcess::platformInitializeWebProcess):
        Set the visible name.

        * WebProcess/mac/WebProcessMainMac.mm:
        (WebKit::WebProcessMain):
        Don't set the visible name here. It's done in platformInitializeWebProcess.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 18340090b100e13d34ffdd48c4219a6a8eb70e92..63ae0250502844ad3b83edea0b5ce772df8d331b 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,58 @@
+2011-01-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Plug-in hosting WebProcess instances appear in Activity Monitor as WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=52635
+        <rdar://problem/8731337>
+
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::initialize):
+        Call platformInitialize.
+
+        * PluginProcess/PluginProcess.h:
+        Add platformInitialize.
+
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::PluginProcess::platformInitialize):
+        Set the compositing render server port and the visible application name.
+
+        * Shared/Plugins/PluginProcessCreationParameters.cpp:
+        (WebKit::PluginProcessCreationParameters::encode):
+        (WebKit::PluginProcessCreationParameters::decode):
+        Encode/decode the parent process name.
+
+        * Shared/Plugins/PluginProcessCreationParameters.h:
+        Add parentProcessName.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        Encode/decode the parent process name.
+
+        * Shared/WebProcessCreationParameters.h:
+        Add parentProcessName.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+        Don't pass the parent process name here.
+
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+        Set the visible name.
+
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        Pass along the parent process name.
+
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        Set the visible name.
+
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMain):
+        Don't set the visible name here. It's done in platformInitializeWebProcess.
+
 2011-01-18  Balazs Kelemen  <kbalazs@webkit.org>
 
         Reviewed by Csaba Osztrogonác.

diff --git a/Source/WebKit2/PluginProcess/PluginProcess.cpp b/Source/WebKit2/PluginProcess/PluginProcess.cpp
index 6c19c21d235750d571102223c373560eb164094f..6124f9a579f8a331c6f31b82e60022f158f79ccc 100644 (file)
--- a/Source/WebKit2/PluginProcess/PluginProcess.cpp
+++ b/Source/WebKit2/PluginProcess/PluginProcess.cpp
@@ -115,9 +115,7 @@ void PluginProcess::initialize(const PluginProcessCreationParameters& parameters
 
     m_pluginPath = parameters.pluginPath;
 
-#if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
-    m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
-#endif
+    platformInitialize(parameters);
 }
 
 void PluginProcess::createWebProcessConnection()

diff --git a/Source/WebKit2/PluginProcess/PluginProcess.h b/Source/WebKit2/PluginProcess/PluginProcess.h
index e60d52d53faf2f8bfcc936d1597351a9c989482e..d7f592e1d79759f91a86aa2ce02b785ffc5421ad 100644 (file)
--- a/Source/WebKit2/PluginProcess/PluginProcess.h
+++ b/Source/WebKit2/PluginProcess/PluginProcess.h
@@ -72,6 +72,8 @@ private:
     
     void shutdownTimerFired();
 
+    void platformInitialize(const PluginProcessCreationParameters&);
+
     // The connection to the UI process.
     RefPtr<CoreIPC::Connection> m_connection;
 

diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
index ccf444c1feeb7d363f06687b694b990d067341d7..3919c8b1db70033ba57f9056dea4d34eabda71e1 100644 (file)
--- a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
+++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
@@ -24,11 +24,16 @@
  */
 
 #if ENABLE(PLUGIN_PROCESS)
+
+// FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized
+#define UI_STRING(__str, __desc) [NSString stringWithUTF8String:__str]
  
 #include "PluginProcess.h"
 
 #include "NetscapePlugin.h"
 #include "PluginProcessShim.h"
+#include "PluginProcessCreationParameters.h"
+#include <WebKitSystemInterface.h>
 #include <dlfcn.h>
 
 namespace WebKit {
@@ -84,6 +89,19 @@ void PluginProcess::initializeShim()
     initFunc(callbacks);
 }
 
+void PluginProcess::platformInitialize(const PluginProcessCreationParameters& parameters)
+{
+    m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
+
+    NSString *applicationName = [NSString stringWithFormat:UI_STRING("%@ (%@ Internet plug-in)",
+                                                                     "visible name of the plug-in host process. The first argument is the plug-in name "
+                                                                     "and the second argument is the application name."),
+                                 [[(NSString *)parameters.pluginPath lastPathComponent] stringByDeletingPathExtension], 
+                                 (NSString *)parameters.parentProcessName];
+    
+    WKSetVisibleApplicationName((CFStringRef)applicationName);
+}
+
 } // namespace WebKit
 
 #endif // ENABLE(PLUGIN_PROCESS)

diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
index 90bbf0772cc658ddec609226905b0e4d2221a32d..c95a825fe0c920cb3c8e3b62384eaf98d6817b7f 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
@@ -40,6 +40,7 @@ void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder)
     encoder->encode(pluginPath);
 
 #if PLATFORM(MAC)
+    encoder->encode(parentProcessName);
     encoder->encode(acceleratedCompositingPort);
 #endif
 }
@@ -50,6 +51,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder,
         return false;
 
 #if PLATFORM(MAC)
+    if (!decoder->decode(result.parentProcessName))
+        return false;
     if (!decoder->decode(result.acceleratedCompositingPort))
         return false;
 #endif

diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
index 1aeef01b20ad3083173d98d9a25f34691c864b51..62cf4bb9220798113f495dd2a29f88bbe9320d3a 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
@@ -50,6 +50,7 @@ struct PluginProcessCreationParameters {
     String pluginPath;
 
 #if PLATFORM(MAC)
+    String parentProcessName;
     CoreIPC::MachPort acceleratedCompositingPort;
 #endif
 };

diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
index ceae6c123145b3b713a702d321afc3bf42c746fd..77e3a82ec8ec6b22c00a928d0d23348a86f3b417 100644 (file)
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
@@ -56,6 +56,7 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
     encoder->encode(languageCode);
     encoder->encode(textCheckerState);
 #if PLATFORM(MAC)
+    encoder->encode(parentProcessName);
     encoder->encode(presenterApplicationPid);
     encoder->encode(nsURLCachePath);
     encoder->encode(nsURLCacheMemoryCapacity);
@@ -95,6 +96,8 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
 
 #if PLATFORM(MAC)
+    if (!decoder->decode(parameters.parentProcessName))
+        return false;
     if (!decoder->decode(parameters.presenterApplicationPid))
         return false;
     if (!decoder->decode(parameters.nsURLCachePath))

diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.h b/Source/WebKit2/Shared/WebProcessCreationParameters.h
index fe582b3e22f0b8460e2d1f92f2a0944e94cc76db..50d8a90f7e867ffc5adb8d0653f3f94868204e14 100644 (file)
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.h
@@ -73,6 +73,8 @@ struct WebProcessCreationParameters {
     TextCheckerState textCheckerState;
 
 #if PLATFORM(MAC)
+    String parentProcessName;
+
     pid_t presenterApplicationPid;
     CString nsURLCachePath;
 

diff --git a/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
index c285bae6887296df7c24704d4145e261c6c7c778..a725d6b7f04a2e3a03f3a9fdf128e4b8b0f665f5 100644 (file)
--- a/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
+++ b/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
@@ -49,32 +49,6 @@ extern "C" kern_return_t bootstrap_register2(mach_port_t, name_t, mach_port_t, u
 
 namespace WebKit {
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-static const char* processName()
-{
-    return [[[NSProcessInfo processInfo] processName] fileSystemRepresentation];
-}
-#else
-// -[NSProcessInfo processName] isn't thread-safe on Leopard and Snow Leopard so we have our own implementation.
-static const char* createProcessName()
-{
-    uint32_t bufferSize = MAXPATHLEN;
-    char executablePath[bufferSize];
-    
-    if (_NSGetExecutablePath(executablePath, &bufferSize))
-        return "";
-    
-    const char *processName = strrchr(executablePath, '/') + 1;
-    return strdup(processName);
-}
-
-static const char* processName()
-{
-    static const char* processName = createProcessName();
-    return processName;
-}
-#endif
-
 static void setUpTerminationNotificationHandler(pid_t pid)
 {
 #if HAVE(DISPATCH_H)
@@ -226,7 +200,7 @@ void ProcessLauncher::launchProcess()
     CString serviceName = String::format("com.apple.WebKit.WebProcess-%d-%p", getpid(), this).utf8();
 
     const char* path = [webProcessAppExecutablePath fileSystemRepresentation];
-    const char* args[] = { path, bundlePath, "-type", processTypeAsString(m_launchOptions.processType), "-servicename", serviceName.data(), "-parentprocessname", processName(), 0 };
+    const char* args[] = { path, bundlePath, "-type", processTypeAsString(m_launchOptions.processType), "-servicename", serviceName.data(), 0 };
 
     // Register ourselves.
     kern_return_t kr = bootstrap_register2(bootstrap_port, const_cast<char*>(serviceName.data()), listeningPort, 0);

diff --git a/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm b/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
index 81c8620a804361712133f1342f1a22ef0deb38e6..eaf8aef7ab35b7c6ac27ab7e05953871ed1c12a2 100644 (file)
--- a/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
+++ b/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
@@ -35,6 +35,7 @@ namespace WebKit {
 void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters& parameters)
 {
 #if USE(ACCELERATED_COMPOSITING) && HAVE(HOSTED_CORE_ANIMATION)
+    parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
     mach_port_t renderServerPort = WKInitializeRenderServer();
     if (renderServerPort != MACH_PORT_NULL)
         parameters.acceleratedCompositingPort = CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);

diff --git a/Source/WebKit2/UIProcess/mac/WebContextMac.mm b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
index ce4c3e6bf60334e381d55d045db6245863a90371..4d1679f9ba863707618347dd289a0dae13747e15 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/WebContextMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
@@ -74,7 +74,8 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
         cachePath = reinterpret_cast<CFStringRef>(NSHomeDirectory());
 
     NSURLCache *urlCache = [NSURLCache sharedURLCache];
-    
+
+    parameters.parentProcessName = [[NSProcessInfo processInfo] processName];    
     parameters.nsURLCachePath = fileSystemRepresentation([(NSString *)cachePath.get() stringByStandardizingPath]);
     parameters.nsURLCacheMemoryCapacity = [urlCache memoryCapacity];
     parameters.nsURLCacheDiskCapacity = [urlCache diskCapacity];

diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
index c899fcbda07dfecf33496324cf39ac7d749c3ee7..d394c980d04d6744f199f7de76f5445a57031147 100644 (file)
--- a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
+++ b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
@@ -151,6 +151,12 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
 {
     initializeSandbox(parameters);
 
+    if (!parameters.parentProcessName.isNull()) {
+        // FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized
+        NSString *applicationName = [NSString stringWithFormat:@"%@ Web Content", (NSString *)parameters.parentProcessName];
+        WKSetVisibleApplicationName((CFStringRef)applicationName);
+    }
+
     if (!parameters.nsURLCachePath.isNull()) {
         NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity;
         NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity;

diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
index 5cefb59c5dce96b023761f58de9cc38da19109ad..a44dc232a533b9ee5dcbedd7ed4e4a70e141928c 100644 (file)
--- a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
+++ b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
@@ -80,14 +80,6 @@ int WebProcessMain(const CommandLine& commandLine)
     WTF::initializeMainThread();
     RunLoop::initializeMainRunLoop();
 
-    // Set the visible application name.
-    String parentProcessName = commandLine["parentprocessname"];
-    if (!parentProcessName.isNull()) {
-        // FIXME: Localization!
-        NSString *applicationName = [NSString stringWithFormat:@"%@ Web Content", (NSString *)parentProcessName];
-        WKSetVisibleApplicationName((CFStringRef)applicationName);
-    }
-
     // Create the connection.
     WebProcess::shared().initialize(serverPort, RunLoop::main());