Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1049)

Unified Diff: public/web/WebServiceWorkerContextClient.h

Issue 900793002: ServiceWorker: Support SWRegistration.unregister() in SWGlobalScope [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: return nullptr instead of 0 Created 5 years, 10 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: public/web/WebServiceWorkerContextClient.h
diff --git a/public/web/WebServiceWorkerContextClient.h b/public/web/WebServiceWorkerContextClient.h
index 3118298353c941e36cefc1a0c056dbef52a4bd25..bdeec5443bc799662c14a324bcb37e8f4f896854 100644
--- a/public/web/WebServiceWorkerContextClient.h
+++ b/public/web/WebServiceWorkerContextClient.h
@@ -47,14 +47,16 @@ class WebDataSource;
class WebServiceWorkerCacheStorage;
class WebServiceWorkerContextProxy;
class WebServiceWorkerNetworkProvider;
+class WebServiceWorkerProvider;
class WebServiceWorkerResponse;
class WebString;
// This interface is implemented by the client. It is supposed to be created
// on the main thread and then passed on to the worker thread.
// by a newly created WorkerGlobalScope. All methods of this class, except
-// for createServiceWorkerNetworkProvider() and workerContextFailedToStart(),
-// are called on the worker thread.
+// for createServiceWorkerNetworkProvider(), createServiceWorkerProvider() and
+// workerContextFailedToStart(), are called on the worker thread.
falken 2015/02/05 12:07:57 My comment on the chromium patch also applies here
nhiroki 2015/02/06 03:49:29 Done.
+//
// FIXME: Split this into EmbeddedWorkerContextClient and
// ServiceWorkerScriptContextClient when we decide to use EmbeddedWorker
// framework for other implementation (like SharedWorker).
@@ -63,7 +65,7 @@ public:
virtual ~WebServiceWorkerContextClient() { }
// ServiceWorker specific method.
- virtual WebServiceWorkerCacheStorage* cacheStorage() { return 0; }
+ virtual WebServiceWorkerCacheStorage* cacheStorage() { return nullptr; }
// ServiceWorker specific method. Called when script accesses the
// the |scope| attribute of the ServiceWorkerGlobalScope. Immutable per spec.
@@ -146,7 +148,10 @@ public:
virtual void didHandleCrossOriginConnectEvent(int connectEventID, bool acceptConnect) { }
// Ownership of the returned object is transferred to the caller.
- virtual WebServiceWorkerNetworkProvider* createServiceWorkerNetworkProvider(WebDataSource*) { return 0; }
+ virtual WebServiceWorkerNetworkProvider* createServiceWorkerNetworkProvider(WebDataSource*) { return nullptr; }
+
+ // Ownership of the returned object is transferred to the caller.
+ virtual WebServiceWorkerProvider* createServiceWorkerProvider() { return nullptr; }
// Ownership of the passed callbacks is transferred to the callee, callee
// should delete the callbacks after calling either onSuccess or onError.

Powered by Google App Engine
This is Rietveld 408576698