Source/modules/serviceworkers/ServiceWorker.cpp - Issue 682003003: Simplify WebServiceWorker{Registration}Proxy interfaces.

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/ServiceWorker.cpp

Issue 682003003: Simplify WebServiceWorker{Registration}Proxy interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove incorrect FIXME Created 6 years, 2 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

Index: Source/modules/serviceworkers/ServiceWorker.cpp

diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp

index 0127d1f677907577f0e276e5776177eb89a510cd..09b5bd6a8b52d3a4c9d581a16d74f51640a2ca85 100644

--- a/Source/modules/serviceworkers/ServiceWorker.cpp

+++ b/Source/modules/serviceworkers/ServiceWorker.cpp

@@ -238,8 +238,7 @@ PassRefPtrWillBeRawPtr<ServiceWorker> ServiceWorker::getOrCreate(ExecutionContex

if (!outerWorker)

return nullptr;

- WebServiceWorkerProxy* proxy = outerWorker->proxy();

- ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0;

+ ServiceWorker* existingServiceWorker = static_cast<ServiceWorker*>(outerWorker->proxy());

if (existingServiceWorker) {

ASSERT(existingServiceWorker->executionContext() == executionContext);

return existingServiceWorker;

@@ -252,7 +251,6 @@ PassRefPtrWillBeRawPtr<ServiceWorker> ServiceWorker::getOrCreate(ExecutionContex

ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker> worker)

: AbstractWorker(executionContext)

- , WebServiceWorkerProxy(this)

, m_outerWorker(worker)

, m_proxyState(Initial)

{

« no previous file with comments | « no previous file | Source/modules/serviceworkers/ServiceWorkerRegistration.cpp » ('j') | no next file with comments »