ServiceWorker: Support SWRegistration.unregister() in SWGlobalScope [2/2]

public/web/WebServiceWorkerContextClient.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "public/platform/WebServiceWorkerSkipWaitingCallbacks.h"
 #include "public/platform/WebURL.h"
 
 namespace blink {
 
 struct WebCrossOriginServiceWorkerClient;
 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).
 class WebServiceWorkerContextClient {
 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.
     virtual WebURL scope() const { return WebURL(); }
 
     // If the worker was started with WebEmbeddedWorkerStartData indicating to pause
     // after download, this method is called after the main script resource has been
     // downloaded. The scope will not be created and the script will not be loaded until
     // WebEmbeddedWorker.resumeAfterDownload() is invoked.
     virtual void didPauseAfterDownload() { }
@@ skipping 62 matching lines @@
     // WebServiceWorkerContextProxy) is handled by the ServiceWorker's script
     // context.
     virtual void didHandleSyncEvent(int syncEventID) { }
 
     // ServiceWorker specific method. Called after CrossOriginConnectEvent
     // (dispatched via WebServiceWorkerContextProxy) is handled by the
     // ServiceWorker's script context.
     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.
     // WebServiceWorkerClientsInfo and WebServiceWorkerError ownerships are
     // passed to the WebServiceWorkerClientsCallbacks implementation.
     virtual void getClients(WebServiceWorkerClientsCallbacks*) { BLINK_ASSERT_NOT_REACHED(); }
 
     // Callee receives ownership of the passed vector.
     // FIXME: Blob refs should be passed to maintain ref counts. crbug.com/351753
     virtual void postMessageToClient(int clientID, const WebString&, WebMessagePortChannelArray*) { BLINK_ASSERT_NOT_REACHED(); }
@@ skipping 18 matching lines @@
         // is present. https://crbug.com/437149
         bool result = true;
         callback->onSuccess(&result);
         delete callback;
     }
 };
 
 } // namespace blink
 
 #endif // WebServiceWorkerContextClient_h