Changeset 223973 in webkit


Ignore:
Timestamp:
Oct 25, 2017 12:36:08 PM (7 years ago)
Author:
Chris Dumez
Message:

[Service Worker] Add stubs for serviceWorkerClient.type
​https://bugs.webkit.org/show_bug.cgi?id=178812

Reviewed by Youenn Fablet.

Add stubs for serviceWorkerClient.type to match the latest specification:

  • CMakeLists.txt:
  • DerivedSources.make:
  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • workers/service/ServiceWorkerClient.cpp:

(WebCore::ServiceWorkerClient::type const):

  • workers/service/ServiceWorkerClient.h:
  • workers/service/ServiceWorkerClient.idl:
  • workers/service/ServiceWorkerClientType.h: Added.
  • workers/service/ServiceWorkerClientType.idl: Added.
  • workers/service/ServiceWorkerClients.h:
  • workers/service/ServiceWorkerClients.idl:
Location:
trunk/Source/WebCore
Files:
1 added
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r223972 r223973  
    807807    workers/service/ServiceWorker.idl
    808808    workers/service/ServiceWorkerClient.idl
     809    workers/service/ServiceWorkerClientType.idl
    809810    workers/service/ServiceWorkerClients.idl
    810811    workers/service/ServiceWorkerContainer.idl

  • trunk/Source/WebCore/ChangeLog

    r223972 r223973  
     12017-10-25  Chris Dumez  <cdumez@apple.com>
     2
     3        [Service Worker] Add stubs for serviceWorkerClient.type
     4        https://bugs.webkit.org/show_bug.cgi?id=178812
     5
     6        Reviewed by Youenn Fablet.
     7
     8        Add stubs for serviceWorkerClient.type to match the latest specification:
     9        - https://w3c.github.io/ServiceWorker/#enumdef-clienttype
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.make:
     13        * Sources.txt:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * workers/service/ServiceWorkerClient.cpp:
     16        (WebCore::ServiceWorkerClient::type const):
     17        * workers/service/ServiceWorkerClient.h:
     18        * workers/service/ServiceWorkerClient.idl:
     19        * workers/service/ServiceWorkerClientType.h: Added.
     20        * workers/service/ServiceWorkerClientType.idl: Added.
     21        * workers/service/ServiceWorkerClients.h:
     22        * workers/service/ServiceWorkerClients.idl:
     23
    1242017-10-24  Keith Miller  <keith_miller@apple.com>
    225

  • trunk/Source/WebCore/DerivedSources.make

    r223945 r223973  
    928928    $(WebCore)/workers/service/ServiceWorker.idl \
    929929    $(WebCore)/workers/service/ServiceWorkerClient.idl \
     930    $(WebCore)/workers/service/ServiceWorkerClientType.idl \
    930931    $(WebCore)/workers/service/ServiceWorkerClients.idl \
    931932    $(WebCore)/workers/service/ServiceWorkerContainer.idl \

  • trunk/Source/WebCore/Sources.txt

    r223972 r223973  
    18001800JSServiceWorker.cpp
    18011801JSServiceWorkerClient.cpp
     1802JSServiceWorkerClientType.cpp
    18021803JSServiceWorkerClients.cpp
    18031804JSServiceWorkerContainer.cpp

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

    r223972 r223973  
    28352835                830784B21C52EE2C00104D1D /* XMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 830784B11C52EE1900104D1D /* XMLDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28362836                830A36BD1DAC5FAD006D7D09 /* JSMouseEventInit.h in Headers */ = {isa = PBXBuildFile; fileRef = 830A36BB1DAC5FA7006D7D09 /* JSMouseEventInit.h */; };
     2837                83102B271F9EADD900E404B9 /* JSExtendableMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 83102B231F9EADC200E404B9 /* JSExtendableMessageEvent.h */; };
    28372838                83120C701C56F3F6001CB112 /* HTMLDataElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 831D1F291C56ECA000F5F6C0 /* HTMLDataElement.cpp */; };
    2838                 83102B271F9EADD900E404B9 /* JSExtendableMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 83102B231F9EADC200E404B9 /* JSExtendableMessageEvent.h */; };
    28392839                83120C711C56F3FB001CB112 /* HTMLDataElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B86A71C56E83A00F3F0E3 /* HTMLDataElement.h */; };
    28402840                8321507E1F27EA1B0095B136 /* NavigatorBeacon.h in Headers */ = {isa = PBXBuildFile; fileRef = 8321507B1F27EA150095B136 /* NavigatorBeacon.h */; };
    … …  
    28592859                836589E01F54A76E00DC31F4 /* JSFileSystemEntriesCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 836589D81F54A76200DC31F4 /* JSFileSystemEntriesCallback.h */; };
    28602860                8367587F1C56E99B008A1087 /* JSHTMLDataElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B86A81C56E93E00F3F0E3 /* JSHTMLDataElement.h */; };
     2861                8369FDFC1FA102E300C1FF1F /* ServiceWorkerClientType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8369FDFB1FA102CB00C1FF1F /* ServiceWorkerClientType.h */; };
    28612862                836ACEC31ECA62C8004BD012 /* DOMMatrixReadOnly.h in Headers */ = {isa = PBXBuildFile; fileRef = 836ACEC01ECA62B0004BD012 /* DOMMatrixReadOnly.h */; };
    28622863                836ACECA1ECA9569004BD012 /* DOMMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 836ACEC51ECA6654004BD012 /* DOMMatrix.h */; };
    … …  
    1058410585                836589DB1F54A76200DC31F4 /* JSFileSystemDirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileSystemDirectoryReader.cpp; sourceTree = "<group>"; };
    1058510586                8369E58F1AFDD0300087DF68 /* NonDocumentTypeChildNode.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = NonDocumentTypeChildNode.idl; sourceTree = "<group>"; };
     10587                8369FDF91FA102CA00C1FF1F /* ServiceWorkerClientType.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ServiceWorkerClientType.idl; sourceTree = "<group>"; };
     10588                8369FDFB1FA102CB00C1FF1F /* ServiceWorkerClientType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerClientType.h; sourceTree = "<group>"; };
    1058610589                836ACEBF1ECA62B0004BD012 /* DOMMatrixReadOnly.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMMatrixReadOnly.cpp; sourceTree = "<group>"; };
    1058710590                836ACEC01ECA62B0004BD012 /* DOMMatrixReadOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMMatrixReadOnly.h; sourceTree = "<group>"; };
    … …  
    1065010653                839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLWBRElement.h; sourceTree = "<group>"; };
    1065110654                83A4A9F81CE7FD7E00709B00 /* JSXMLDocumentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLDocumentCustom.cpp; sourceTree = "<group>"; };
     10655                83B250091FA1181C00BC02D9 /* JSServiceWorkerClientType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSServiceWorkerClientType.h; sourceTree = "<group>"; };
     10656                83B2500B1FA1181D00BC02D9 /* JSServiceWorkerClientType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSServiceWorkerClientType.cpp; sourceTree = "<group>"; };
    1065210657                83B74EF21F3E0BD700996BC7 /* KeepaliveRequestTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeepaliveRequestTracker.cpp; sourceTree = "<group>"; };
    1065310658                83B74EF31F3E0BD700996BC7 /* KeepaliveRequestTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeepaliveRequestTracker.h; sourceTree = "<group>"; };
    … …  
    1808818093                                46EB37C41F97CCCB00B65523 /* JSServiceWorkerClients.cpp */,
    1808918094                                46EB37C51F97CCCB00B65523 /* JSServiceWorkerClients.h */,
     18095                                83B2500B1FA1181D00BC02D9 /* JSServiceWorkerClientType.cpp */,
     18096                                83B250091FA1181C00BC02D9 /* JSServiceWorkerClientType.h */,
    1809018097                                5182C2511F3142500059BA7C /* JSServiceWorkerContainer.cpp */,
    1809118098                                5182C2541F3142500059BA7C /* JSServiceWorkerContainer.h */,
    … …  
    1818418191                                46EF14221F97B7BA00C2A524 /* ServiceWorkerClients.h */,
    1818518192                                46EF14231F97B7BA00C2A524 /* ServiceWorkerClients.idl */,
     18193                                8369FDFB1FA102CB00C1FF1F /* ServiceWorkerClientType.h */,
     18194                                8369FDF91FA102CA00C1FF1F /* ServiceWorkerClientType.idl */,
    1818618195                                51F175581F3EBC0C00C74950 /* ServiceWorkerContainer.cpp */,
    1818718196                                51F175571F3EBC0C00C74950 /* ServiceWorkerContainer.h */,
    … …  
    2951929528                                46EF142D1F97B7D800C2A524 /* ServiceWorkerClient.h in Headers */,
    2952029529                                46EF142C1F97B7D800C2A524 /* ServiceWorkerClients.h in Headers */,
     29530                                8369FDFC1FA102E300C1FF1F /* ServiceWorkerClientType.h in Headers */,
    2952129531                                51F1755F1F3EBC8300C74950 /* ServiceWorkerContainer.h in Headers */,
    2952229532                                51CA7EE91F883390003D3131 /* ServiceWorkerContextData.h in Headers */,

  • trunk/Source/WebCore/workers/service/ServiceWorkerClient.cpp

    r223634 r223973  
    5757}
    5858
     59auto ServiceWorkerClient::type() const -> Type
     60{
     61    return Type::Window;
     62}
     63
    5964String ServiceWorkerClient::id() const
    6065{

  • trunk/Source/WebCore/workers/service/ServiceWorkerClient.h

    r223634 r223973  
    3030#include "ActiveDOMObject.h"
    3131#include "ExceptionOr.h"
     32#include "ServiceWorkerClientType.h"
    3233#include <heap/Strong.h>
    3334#include <wtf/RefCounted.h>
    … …  
    4243class ServiceWorkerClient : public RefCounted<ServiceWorkerClient>, public ActiveDOMObject {
    4344public:
     45    using Type = ServiceWorkerClientType;
    4446    enum class FrameType {
    4547        Auxiliary,
    … …  
    5153    String url() const;
    5254    FrameType frameType() const;
     55    Type type() const;
    5356    String id() const;
    5457

  • trunk/Source/WebCore/workers/service/ServiceWorkerClient.idl

    r223634 r223973  
    3232    readonly attribute USVString url;
    3333    readonly attribute FrameType frameType;
     34    readonly attribute ServiceWorkerClientType type;
    3435    readonly attribute DOMString id;
    3536

  • trunk/Source/WebCore/workers/service/ServiceWorkerClientType.h

    r223972 r223973  
    2424 */
    2525
    26 [
    27     Conditional=SERVICE_WORKER,
    28     EnabledAtRuntime=ServiceWorker,
    29     Exposed=ServiceWorker,
    30     InterfaceName=Client,
    31 ] interface ServiceWorkerClient {
    32     readonly attribute USVString url;
    33     readonly attribute FrameType frameType;
    34     readonly attribute DOMString id;
     26#pragma once
    3527
    36     [CallWith=ScriptState, MayThrowException] void postMessage(any message, optional sequence<object> transfer = []);
     28#if ENABLE(SERVICE_WORKER)
     29
     30namespace WebCore {
     31
     32enum class ServiceWorkerClientType {
     33    Window,
     34    Worker,
     35    Sharedworker,
     36    All
    3737};
    3838
    39 enum FrameType {
    40   "auxiliary",
    41   "top-level",
    42   "nested",
    43   "none"
    44 };
     39}
     40
     41#endif

  • trunk/Source/WebCore/workers/service/ServiceWorkerClients.h

    r223634 r223973  
    2929
    3030#include "ActiveDOMObject.h"
     31#include "ServiceWorkerClientType.h"
    3132#include <wtf/Ref.h>
    3233#include <wtf/RefCounted.h>
    … …  
    4344    }
    4445
    45     enum class ClientType {
    46         Window,
    47         Worker,
    48         Sharedworker,
    49         All
    50     };
    51 
    5246    struct ClientQueryOptions {
    5347        bool includeUncontrolled { false };
    54         ClientType type { ClientType::Window };
     48        ServiceWorkerClientType type { ServiceWorkerClientType::Window };
    5549    };
    5650

  • trunk/Source/WebCore/workers/service/ServiceWorkerClients.idl

    r223634 r223973  
    3939dictionary ClientQueryOptions {
    4040    boolean includeUncontrolled = false;
    41     ClientType type = "window";
     41    ServiceWorkerClientType type = "window";
    4242};
    43 
    44 enum ClientType {
    45     "window",
    46     "worker",
    47     "sharedworker",
    48     "all"
    49 };
Note: See TracChangeset for help on using the changeset viewer.