Changeset 244054 in webkit

Timestamp:

Apr 8, 2019, 3:29:47 PM (7 years ago)

Author:

youenn@apple.com

Message:

Add a test to check for the service worker process name
​https://bugs.webkit.org/show_bug.cgi?id=196621

Reviewed by Chris Dumez.

Source/WebCore:

Add a service worker internal API to get process name.
Covered by updated test.

• WebCore.xcodeproj/project.pbxproj:
• testing/ServiceWorkerInternals.cpp:

(WebCore::ServiceWorkerInternals::processName const):

• testing/ServiceWorkerInternals.h:
• testing/ServiceWorkerInternals.idl:
• testing/ServiceWorkerInternals.mm: Added.

LayoutTests:

• http/wpt/service-workers/online-worker.js:

(async.doTest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/service-workers/online-worker.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• Source/WebCore/testing/ServiceWorkerInternals.cpp (modified) (1 diff)
• Source/WebCore/testing/ServiceWorkerInternals.h (modified) (1 diff)
• Source/WebCore/testing/ServiceWorkerInternals.idl (modified) (1 diff)
• Source/WebCore/testing/ServiceWorkerInternals.mm (copied) (copied from trunk/Source/WebCore/testing/ServiceWorkerInternals.idl ) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-08  Youenn Fablet  <youenn@apple.com>
+
+        Add a test to check for the service worker process name
+        https://bugs.webkit.org/show_bug.cgi?id=196621
+
+        Reviewed by Chris Dumez.
+
+        * http/wpt/service-workers/online-worker.js:
+        (async.doTest):
+
 2019-04-08  Shawn Roberts  <sroberts@apple.com>
 

trunk/LayoutTests/http/wpt/service-workers/online-worker.js

@@ -28 +28 @@
         }
 
+        if (self.internals.processName !== "none" && self.internals.processName !== "WebKitTestRunner Service Worker (localhost)") {
+            event.source.postMessage("FAIL: wrong service worker process name: " + self.internals.processName + "'");
+            return;
+        }
+
         internals.setOnline(true);
         var eventName = await waitForOnlineEvent();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-08  Youenn Fablet  <youenn@apple.com>
+
+        Add a test to check for the service worker process name
+        https://bugs.webkit.org/show_bug.cgi?id=196621
+
+        Reviewed by Chris Dumez.
+
+        Add a service worker internal API to get process name.
+        Covered by updated test.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * testing/ServiceWorkerInternals.cpp:
+        (WebCore::ServiceWorkerInternals::processName const):
+        * testing/ServiceWorkerInternals.h:
+        * testing/ServiceWorkerInternals.idl:
+        * testing/ServiceWorkerInternals.mm: Added.
+
 2019-04-08  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1123 +1123 @@
                 41D129DB1F3D143800D15E47 /* FetchHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F54F831C50C4F600338488 /* FetchHeaders.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 41D28D0D2139E05800F4206F /* LibWebRTCStatsCollector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D28D0B2139E01D00F4206F /* LibWebRTCStatsCollector.cpp */; };
+                41D41C672256874F00697942 /* ServiceWorkerInternals.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41D41C652256859200697942 /* ServiceWorkerInternals.mm */; };
                 41DE7C7C222DA14300532B65 /* StorageQuotaManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DE7C7B222DA13E00532B65 /* StorageQuotaManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 41DE7C7D222DA14800532B65 /* StorageQuotaUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DE7C78222DA13C00532B65 /* StorageQuotaUser.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7363 +7364 @@
                 41D28D0B2139E01D00F4206F /* LibWebRTCStatsCollector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCStatsCollector.cpp; path = libwebrtc/LibWebRTCStatsCollector.cpp; sourceTree = "<group>"; };
                 41D28D0C2139E01E00F4206F /* LibWebRTCStatsCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCStatsCollector.h; path = libwebrtc/LibWebRTCStatsCollector.h; sourceTree = "<group>"; };
+                41D41C652256859200697942 /* ServiceWorkerInternals.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServiceWorkerInternals.mm; sourceTree = "<group>"; };
                 41D51BB21E4E2E8100131A5B /* LibWebRTCAudioFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCAudioFormat.h; path = libwebrtc/LibWebRTCAudioFormat.h; sourceTree = "<group>"; };
                 41DE7C78222DA13C00532B65 /* StorageQuotaUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageQuotaUser.h; sourceTree = "<group>"; };
@@ -17667 +17669 @@
                                 417F0D7E1FFEE14E008EF303 /* ServiceWorkerInternals.h */,
                                 417F0D811FFEE150008EF303 /* ServiceWorkerInternals.idl */,
+                                41D41C652256859200697942 /* ServiceWorkerInternals.mm */,
                                 EB081CD81696084400553730 /* TypeConversions.h */,
                                 EB081CD91696084400553730 /* TypeConversions.idl */,
@@ -28893 +28896 @@
                                 9B714E211C91166900AC0E92 /* EventPath.h in Headers */,
                                 8F67561B1288B17B0047ACA3 /* EventQueue.h in Headers */,
+                                E4A8D21622578DB700A8463C /* EventRegion.h in Headers */,
                                 E0FEF372B17C53EAC1C1FBEE /* EventSource.h in Headers */,
                                 E12EDB7B0B308A78002704B6 /* EventTarget.h in Headers */,
@@ -29786 +29790 @@
                                 1AE2AE5C0A1D26F200B42B25 /* JSHTMLMenuElement.h in Headers */,
                                 A80E7A180A19C3D6007FB8C5 /* JSHTMLMetaElement.h in Headers */,
-                                E4A8D21622578DB700A8463C /* EventRegion.h in Headers */,
                                 A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */,
                                 1AE2AB2A0A1CE63B00B42B25 /* JSHTMLModElement.h in Headers */,
@@ -32524 +32527 @@
                                 AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */,
                                 417F0D821FFEE979008EF303 /* ServiceWorkerInternals.cpp in Sources */,
+                                41D41C672256874F00697942 /* ServiceWorkerInternals.mm in Sources */,
                                 DE7710861FA2F0D600460016 /* WebArchiveDumpSupport.mm in Sources */,
                                 41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,

trunk/Source/WebCore/testing/ServiceWorkerInternals.cpp

@@ -90 +90 @@
 }
 
+#if !PLATFORM(MAC)
+String ServiceWorkerInternals::processName() const
+{
+    return "none"_s;
+}
+#endif
+
 } // namespace WebCore
 

trunk/Source/WebCore/testing/ServiceWorkerInternals.h

@@ -50 +50 @@
     Vector<String> fetchResponseHeaderList(FetchResponse&);
 
+    String processName() const;
+
 private:
     explicit ServiceWorkerInternals(ServiceWorkerIdentifier);

trunk/Source/WebCore/testing/ServiceWorkerInternals.idl

@@ -36 +36 @@
 
     sequence<ByteString> fetchResponseHeaderList(FetchResponse response);
+
+    readonly attribute DOMString processName;
 };

trunk/Source/WebCore/testing/ServiceWorkerInternals.mm

@@ -24 +24 @@
  */
 
-[
-    Conditional=SERVICE_WORKER,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
-    ImplementationLacksVTable,
-    NoInterfaceObject,
-] interface ServiceWorkerInternals {
-    void setOnline(boolean isOnline);
-    Promise<Response> waitForFetchEventToFinish(FetchEvent event);
-    [CallWith=ScriptExecutionContext] FetchEvent createBeingDispatchedFetchEvent();
-    [CallWith=ScriptExecutionContext] FetchResponse createOpaqueWithBlobBodyResponse();
+#include "config.h"
+#include "ServiceWorkerInternals.h"
 
-    sequence<ByteString> fetchResponseHeaderList(FetchResponse response);
-};
+#if ENABLE(SERVICE_WORKER)
+
+#if PLATFORM(MAC)
+
+#import <pal/spi/cocoa/LaunchServicesSPI.h>
+
+namespace WebCore {
+
+String ServiceWorkerInternals::processName() const
+{
+    return adoptCF((CFStringRef)_LSCopyApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), _kLSDisplayNameKey)).get();
+}
+
+} // namespace WebCore
+
+#endif
+
+#endif