Source/modules/serviceworkers/ServiceWorkerGlobalScope.h - Issue 723923002: ServiceWorker: Add support for .skipWaiting and controllerchange event(1/3)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

Issue 723923002: ServiceWorker: Add support for .skipWaiting and controllerchange event(1/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: split the CL Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/modules/serviceworkers/ServiceWorkerContainer.cpp ('K') | « Source/modules/serviceworkers/ServiceWorkerContainer.idl ('k') | Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp » ('j') | public/platform/WebServiceWorkerSkipWaitingCallbacks.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

index c91ed61515a7ec826fd035f8aaccf05d8a2da3e2..fcfb1ba3f77c43017a90b261e6edd10145f93a95 100644

--- a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

+++ b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

@@ -74,6 +74,8 @@ public:

void close(ExceptionState&);

+ ScriptPromise skipWaiting(ScriptState*);

// EventTarget

virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) override;

virtual const AtomicString& interfaceName() const override;

@@ -90,6 +92,8 @@ public:

virtual void trace(Visitor*) override;

private:

+ class SkipWaitingCallback;

ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerThread*, double timeOrigin, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>);

virtual void importScripts(const Vector<String>& urls, ExceptionState&) override;

virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) override;