Title: [229878] trunk/Source
Revision
229878
Author
[email protected]
Date
2018-03-22 18:37:15 -0700 (Thu, 22 Mar 2018)

Log Message

Include security origin in the service worker process name
https://bugs.webkit.org/show_bug.cgi?id=183913

Reviewed by Youenn Fablet.

Source/WebCore:

Updated localizable strings.

* English.lproj/Localizable.strings:

Source/WebKit:

Include security origin in the service worker process name to facilitate debugging. This way, we
can differentiate which service worker process is used for which origin in activity monitor.

* Shared/ChildProcess.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
(WebKit::XPCServiceInitializerDelegate::getExtraInitializationData):
* UIProcess/ServiceWorkerProcessProxy.cpp:
(WebKit::ServiceWorkerProcessProxy::getLaunchOptions):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::initializeProcessName):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (229877 => 229878)


--- trunk/Source/WebCore/ChangeLog	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebCore/ChangeLog	2018-03-23 01:37:15 UTC (rev 229878)
@@ -1,3 +1,14 @@
+2018-03-22  Chris Dumez  <[email protected]>
+
+        Include security origin in the service worker process name
+        https://bugs.webkit.org/show_bug.cgi?id=183913
+
+        Reviewed by Youenn Fablet.
+
+        Updated localizable strings.
+
+        * English.lproj/Localizable.strings:
+
 2018-03-22  Youenn Fablet  <[email protected]>
 
         Use libwebrtc ObjectiveC H264 encoder and decoder

Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (229877 => 229878)


--- trunk/Source/WebCore/English.lproj/Localizable.strings	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings	2018-03-23 01:37:15 UTC (rev 229878)
@@ -41,7 +41,7 @@
 "%@ SDH" = "%@ SDH";
 
 /* Visible name of Service Worker process. The argument is the application name. */
-"%@ Service Worker" = "%@ Service Worker";
+"%@ Service Worker (%@)" = "%@ Service Worker (%@)";
 
 /* visible name of the storage process. The argument is the application name. */
 "%@ Storage" = "%@ Storage";
@@ -115,9 +115,6 @@
 /* Label text to be used when an insecure plug-in version was blocked from loading */
 "Blocked Plug-In (Insecure plug-in)" = "Blocked Plug-in";
 
-/* Label text to be used when an insecure plug-in version was blocked from loading */
-"Unsupported Plug-In" = "Unsupported Plug-in";
-
 /* Bold context menu item */
 "Bold" = "Bold";
 
@@ -215,8 +212,11 @@
 "Cut (Undo action name)" = "Cut";
 
 /* Day label in date picker */
-"Day label in date picker" = "Day";
+"Day label in date picker" = "Day label in date picker";
 
+/* Fullscreen Deceptive Website Warning Sheet Title */
+"Deceptive Website Warning" = "Deceptive Website Warning";
+
 /* Default writing direction context menu item */
 "Default" = "Default";
 
@@ -229,11 +229,8 @@
 /* Undo action name */
 "Dictation (Undo action name)" = "Dictation";
 
-/* Text of button that exits element fullscreen. */
-"Done" = "Done";
-
 /* Title of the Done button for zoomed form controls. */
-"Done (extra zoomed form controls)" = "Done";
+"Done (extra zoomed form controls)" = "Done (extra zoomed form controls)";
 
 /* Download Audio To Disk context menu item */
 "Download Audio" = "Download Audio";
@@ -274,6 +271,9 @@
 /* Video Exit Fullscreen context menu item */
 "Exit Full Screen (context menu)" = "Exit Full Screen";
 
+/* Fullscreen Deceptive Website Exit Action */
+"Exit Fullscreen" = "Exit Fullscreen";
+
 /* menu item */
 "Exit Picture in Picture" = "Exit Picture in Picture";
 
@@ -416,7 +416,7 @@
 "Missing Plug-in" = "Missing Plug-in";
 
 /* Month label in date picker */
-"Month label in date picker" = "Month";
+"Month label in date picker" = "Month label in date picker";
 
 /* Media Mute context menu item */
 "Mute" = "Mute";
@@ -643,6 +643,9 @@
 /* Start speaking context menu item */
 "Start Speaking" = "Start Speaking";
 
+/* Fullscreen Deceptive Website Stay Action */
+"Stay in Fullscreen" = "Stay in Fullscreen";
+
 /* Stop context menu item */
 "Stop" = "Stop";
 
@@ -655,6 +658,9 @@
 /* Stop speaking context menu item */
 "Stop Speaking" = "Stop Speaking";
 
+/* Label for strong password. */
+"Strong Password" = "Strong Password";
+
 /* Styles context menu item */
 "Styles…" = "Styles…";
 
@@ -724,6 +730,9 @@
 /* prompt string in authentication panel */
 "The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again." = "The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again.";
 
+/* Fullscreen Deceptive Website Warning Sheet Content Text */
+"The website \"%@\" may be a deceptive website. Would you like to exit fullscreen?" = "The website \"%@\" may be a deceptive website. Would you like to exit fullscreen?";
+
 /* text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' */
 "This is a searchable index. Enter search keywords: " = "This is a searchable index. Enter search keywords: ";
 
@@ -775,6 +784,9 @@
 /* Undo action name */
 "Unscript (Undo action name)" = "Unscript";
 
+/* Label text to be used when an unsupported plug-in was blocked from loading */
+"Unsupported Plug-In" = "Unsupported Plug-in";
+
 /* Undo action name */
 "Use All Ligatures (Undo action name)" = "Use All Ligatures";
 
@@ -827,7 +839,7 @@
 "Write" = "Write";
 
 /* Year label in date picker */
-"Year label in date picker" = "Year";
+"Year label in date picker" = "Year label in date picker";
 
 /* message in authentication panel */
 "Your login information will be sent securely." = "Your login information will be sent securely.";
@@ -1201,9 +1213,6 @@
 /* Label for the strong confirmation password auto fill button inside a text field. */
 "strong confirmation password auto fill" = "strong confirmation password auto fill";
 
-/* Label for strong password. */
-"Strong Password" = "Strong Password";
-
 /* Label for the strong password auto fill button inside a text field. */
 "strong password auto fill" = "strong password auto fill";
 

Modified: trunk/Source/WebKit/ChangeLog (229877 => 229878)


--- trunk/Source/WebKit/ChangeLog	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebKit/ChangeLog	2018-03-23 01:37:15 UTC (rev 229878)
@@ -1,3 +1,21 @@
+2018-03-22  Chris Dumez  <[email protected]>
+
+        Include security origin in the service worker process name
+        https://bugs.webkit.org/show_bug.cgi?id=183913
+
+        Reviewed by Youenn Fablet.
+
+        Include security origin in the service worker process name to facilitate debugging. This way, we
+        can differentiate which service worker process is used for which origin in activity monitor.
+
+        * Shared/ChildProcess.h:
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
+        (WebKit::XPCServiceInitializerDelegate::getExtraInitializationData):
+        * UIProcess/ServiceWorkerProcessProxy.cpp:
+        (WebKit::ServiceWorkerProcessProxy::getLaunchOptions):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::initializeProcessName):
+
 2018-03-22  Michael Catanzaro  <[email protected]>
 
         Unreviewed, silence unused variable warning

Modified: trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm (229877 => 229878)


--- trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm	2018-03-23 01:37:15 UTC (rev 229878)
@@ -121,6 +121,10 @@
         extraInitializationData.add(ASCIILiteral("service-worker-process"), serviceWorkerProcess);
 #endif
 
+    String securityOrigin = xpc_dictionary_get_string(extraDataInitializationDataObject, "security-origin");
+    if (!securityOrigin.isEmpty())
+        extraInitializationData.add(ASCIILiteral("security-origin"), securityOrigin);
+
     if (!isClientSandboxed()) {
         String userDirectorySuffix = xpc_dictionary_get_string(extraDataInitializationDataObject, "user-directory-suffix");
         if (!userDirectorySuffix.isEmpty())

Modified: trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp (229877 => 229878)


--- trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp	2018-03-23 01:37:15 UTC (rev 229878)
@@ -71,6 +71,7 @@
     WebProcessProxy::getLaunchOptions(launchOptions);
 
     launchOptions.extraInitializationData.add(ASCIILiteral("service-worker-process"), ASCIILiteral("1"));
+    launchOptions.extraInitializationData.add(ASCIILiteral("security-origin"), origin().toString());
 }
 
 void ServiceWorkerProcessProxy::start(const WebPreferencesStore& store, std::optional<PAL::SessionID> initialSessionID)

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (229877 => 229878)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2018-03-23 01:19:25 UTC (rev 229877)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2018-03-23 01:37:15 UTC (rev 229878)
@@ -192,7 +192,7 @@
         applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Web Inspector", "Visible name of Web Inspector's web process. The argument is the application name."), (NSString *)parameters.uiProcessName];
 #if ENABLE(SERVICE_WORKER)
     else if (parameters.extraInitializationData.get(ASCIILiteral("service-worker-process")) == "1")
-        applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Service Worker", "Visible name of Service Worker process. The argument is the application name."), (NSString *)parameters.uiProcessName];
+        applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Service Worker (%@)", "Visible name of Service Worker process. The argument is the application name."), (NSString *)parameters.uiProcessName, (NSString *)parameters.extraInitializationData.get(ASCIILiteral("security-origin"))];
 #endif
     else
         applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Web Content", "Visible name of the web process. The argument is the application name."), (NSString *)parameters.uiProcessName];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to