Title: [144580] trunk/Source/WebKit2
Revision
144580
Author
[email protected]
Date
2013-03-03 14:15:00 -0800 (Sun, 03 Mar 2013)

Log Message

Shared Web Workers have an incorrect visible process name
https://bugs.webkit.org/show_bug.cgi?id=111277

Reviewed by Dan Bernstein.

* SharedWorkerProcess/SharedWorkerProcess.cpp:
(WebKit::SharedWorkerProcess::initializeSharedWorkerProcess):
* SharedWorkerProcess/SharedWorkerProcess.h:
(SharedWorkerProcess):
* SharedWorkerProcess/mac/SharedWorkerProcessMac.mm:
(WebKit::SharedWorkerProcess::initializeProcessName):
The SharedWorkerProcess is not an internet plug-in!

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (144579 => 144580)


--- trunk/Source/WebKit2/ChangeLog	2013-03-03 20:43:44 UTC (rev 144579)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-03 22:15:00 UTC (rev 144580)
@@ -1,3 +1,18 @@
+2013-03-03  Sam Weinig  <[email protected]>
+
+        Shared Web Workers have an incorrect visible process name
+        https://bugs.webkit.org/show_bug.cgi?id=111277
+
+        Reviewed by Dan Bernstein.
+
+        * SharedWorkerProcess/SharedWorkerProcess.cpp:
+        (WebKit::SharedWorkerProcess::initializeSharedWorkerProcess):
+        * SharedWorkerProcess/SharedWorkerProcess.h:
+        (SharedWorkerProcess):
+        * SharedWorkerProcess/mac/SharedWorkerProcessMac.mm:
+        (WebKit::SharedWorkerProcess::initializeProcessName):
+        The SharedWorkerProcess is not an internet plug-in!
+
 2013-03-03  Adam Barth  <[email protected]>
 
         Unreviewed attempted build fix. Adds back some includes removed in

Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp (144579 => 144580)


--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp	2013-03-03 20:43:44 UTC (rev 144579)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp	2013-03-03 22:15:00 UTC (rev 144580)
@@ -113,8 +113,6 @@
 {
     setMinimumLifetime(parameters.minimumLifetime);
     setTerminationTimeout(parameters.terminationTimeout);
-
-    platformInitializeSharedWorkerProcess(parameters);
 }
 
 void SharedWorkerProcess::createWebProcessConnection()

Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h (144579 => 144580)


--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h	2013-03-03 20:43:44 UTC (rev 144579)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h	2013-03-03 22:15:00 UTC (rev 144580)
@@ -48,6 +48,7 @@
     ~SharedWorkerProcess();
 
     // ChildProcess
+    virtual void initializeProcessName(const ChildProcessInitializationParameters&) OVERRIDE;
     virtual bool shouldTerminate() OVERRIDE;
 
     // CoreIPC::Connection::Client
@@ -60,8 +61,6 @@
     void initializeSharedWorkerProcess(const SharedWorkerProcessCreationParameters&);
     void createWebProcessConnection();
 
-    void platformInitializeSharedWorkerProcess(const SharedWorkerProcessCreationParameters&);
-    
     void setMinimumLifetime(double);
     void minimumLifetimeTimerFired();
 

Modified: trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMac.mm (144579 => 144580)


--- trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMac.mm	2013-03-03 20:43:44 UTC (rev 144579)
+++ trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMac.mm	2013-03-03 22:15:00 UTC (rev 144580)
@@ -28,20 +28,14 @@
 
 #if ENABLE(SHARED_WORKER_PROCESS)
 
-#import "SharedWorkerProcessProxyMessages.h"
-#import "SharedWorkerProcessCreationParameters.h"
 #import <WebCore/LocalizedStrings.h>
 #import <WebKitSystemInterface.h>
 
-
 namespace WebKit {
 
-void SharedWorkerProcess::platformInitializeSharedWorkerProcess(const SharedWorkerProcessCreationParameters& parameters)
+void SharedWorkerProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
 {
-    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("Shared Web Worker (%@ Internet plug-in)",
-        "visible name of the plug-in host process. The argument is the application name."),
-        (NSString *)parameters.parentProcessName];
-    
+    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Shared Worker", "Visible name of the shared worker process. The argument is the application name."), (NSString *)parameters.uiProcessName];
     WKSetVisibleApplicationName((CFStringRef)applicationName);
 
     // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to