Source/modules/serviceworkers/ServiceWorkerContainer.h - Issue 541943003: ServiceWorker: Remove navigator.serviceWorker.{installing,waiting,active} (Blink)

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/ServiceWorkerContainer.h

Issue 541943003: ServiceWorker: Remove navigator.serviceWorker.{installing,waiting,active} (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: update expectations Created 6 years, 3 months 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

« no previous file with comments | « LayoutTests/fast/serviceworker/serviceworkercontainer-interface.html ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerContainer.h

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

index d7eb4c61ac927d9b8b0cc05b5ba3c4ae477ec19b..1aebd8b7ef7a0993671712b792798bf1b8b2ed7e 100644

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

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

@@ -65,10 +65,7 @@ public:

void trace(Visitor*);

- PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); }

PassRefPtrWillBeRawPtr<ServiceWorker> controller() { return m_controller.get(); }

- PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get(); }

- PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }

ScriptPromise ready(ScriptState*);

WebServiceWorkerProvider* provider() { return m_provider; }

@@ -76,10 +73,7 @@ public:

ScriptPromise unregisterServiceWorker(ScriptState*, const String& scope);

// WebServiceWorkerProviderClient overrides.

- virtual void setActive(WebServiceWorker*) OVERRIDE;

virtual void setController(WebServiceWorker*) OVERRIDE;

- virtual void setInstalling(WebServiceWorker*) OVERRIDE;

- virtual void setWaiting(WebServiceWorker*) OVERRIDE;

virtual void setReadyRegistration(WebServiceWorkerRegistration*) OVERRIDE;

virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) OVERRIDE;

@@ -90,10 +84,7 @@ private:

ReadyProperty* createReadyProperty();

WebServiceWorkerProvider* m_provider;

- RefPtrWillBeMember<ServiceWorker> m_active;

RefPtrWillBeMember<ServiceWorker> m_controller;

- RefPtrWillBeMember<ServiceWorker> m_installing;

- RefPtrWillBeMember<ServiceWorker> m_waiting;

Member<ServiceWorkerRegistration> m_readyRegistration;

Member<ReadyProperty> m_ready;

};