| Index: Source/modules/navigatorconnect/AcceptConnectionObserver.h
|
| diff --git a/Source/modules/navigatorconnect/AcceptConnectionObserver.h b/Source/modules/navigatorconnect/AcceptConnectionObserver.h
|
| index fa4bd393a4f2b75385d52e2e582320c24c4c1e97..a92326705674f9aa56f55472899648cddb483679 100644
|
| --- a/Source/modules/navigatorconnect/AcceptConnectionObserver.h
|
| +++ b/Source/modules/navigatorconnect/AcceptConnectionObserver.h
|
| @@ -20,13 +20,12 @@ class ScriptPromise;
|
| class ScriptState;
|
| class ScriptValue;
|
|
|
| -// This class observes the service worker's handling of a CrossOriginConnectEvent
|
| -// and notified the client of the result. Created for each instance of
|
| -// CrossOriginConnectEvent.
|
| +// This class observes the service worker's handling of a ServicePortConnectEvent
|
| +// and notifies the client of the result. Created for each instance of
|
| +// ServicePortConnectEvent.
|
| class MODULES_EXPORT AcceptConnectionObserver final : public GarbageCollectedFinalized<AcceptConnectionObserver>, public ContextLifecycleObserver {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AcceptConnectionObserver);
|
| public:
|
| - static AcceptConnectionObserver* create(ExecutionContext*, int eventID);
|
| static AcceptConnectionObserver* create(ServicePortCollection*, PassOwnPtr<WebServicePortConnectEventCallbacks>, WebServicePortID, const KURL& targetURL);
|
|
|
| void contextDestroyed() override;
|
| @@ -35,10 +34,6 @@ public:
|
| // be rejected if no call to acceptConnection or respondWith was made.
|
| void didDispatchEvent();
|
|
|
| - // Observes the promise and delays calling didHandleCrossOriginConnectEvent()
|
| - // until the given promise is resolved or rejected.
|
| - void acceptConnection(ScriptState*, ScriptPromise, ExceptionState&);
|
| -
|
| // Observes the promise and delays calling didHandleServicePortConnectEvent()
|
| // until the given promise is resolved or rejected. Returns a promise that
|
| // resolves to a ServicePort when the connection is accepted.
|
| @@ -52,10 +47,8 @@ public:
|
| private:
|
| class ThenFunction;
|
|
|
| - AcceptConnectionObserver(ExecutionContext*, int eventID);
|
| AcceptConnectionObserver(ServicePortCollection*, PassOwnPtr<WebServicePortConnectEventCallbacks>, WebServicePortID, const KURL& targetURL);
|
|
|
| - int m_eventID;
|
| OwnPtr<WebServicePortConnectEventCallbacks> m_callbacks;
|
| Member<ServicePortCollection> m_collection;
|
| WebServicePortID m_portID;
|
|
|