Revert of ServiceWorker: throw when close() or terminate() called (pa…

…tchset #3 of https://codereview.chromium.org/505063002/) Reason for revert: Break compilation on various bots. Maybe Win only. Original issue's description: > ServiceWorker: throw when close() or terminate() called > > Per spec: > * ServiceWorker#terminate() should throw InvalidAccessError > * ServiceWorkerGlobalScope#close() should throw InvalidAccessError > > ... since the behaviors inherited from the base interfaces are not > supported. > > Spec: slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html > > BUG=398318 > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181049 [email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=398318 Review URL: https://codereview.chromium.org/515323002 git-svn-id: svn://svn.chromium.org/blink/trunk@181050 bbb929c8-8fbe-4397-9dbb-9b2b20218538
yoavweiss · Aug 28, 2014 · 1471064 · 1471064
1 parent 197b360
commit 1471064
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 76 deletions.
diff --git a/LayoutTests/http/tests/serviceworker/interfaces.html b/LayoutTests/http/tests/serviceworker/interfaces.html
@@ -42,7 +42,6 @@
             {
               scriptURL: 'string',
               state: 'string',
-              terminate: 'function',
               onstatechange: EVENT_HANDLER
             });
           return registration.unregister();

diff --git a/LayoutTests/http/tests/serviceworker/resources/fetch-body-stream-worker.js b/LayoutTests/http/tests/serviceworker/resources/fetch-body-stream-worker.js
@@ -8,6 +8,7 @@ self.onmessage = function(e) {
 
 function quit(port) {
     port.postMessage('quit');
+    self.close();
 }
 
 function doFetchTwiceTest(port) {
@@ -91,4 +92,4 @@ function doTextTest(port) {
           doJSONTest(port);
       });
   });
-}
+}
diff --git a/LayoutTests/http/tests/serviceworker/resources/fetch-worker.js b/LayoutTests/http/tests/serviceworker/resources/fetch-worker.js
@@ -15,19 +15,12 @@ var testTargets = [
 ];
 
 function doNextFetchTest(port) {
-
-    function runInfiniteFetchLoop() {
-      fetch('dummy.html')
-        .then(function() { runInfiniteFetchLoop(); });
-    }
-
     if (testTargets.length == 0) {
-      // Destroying the execution context while fetch is happening
-      // should not cause a crash.
-      runInfiniteFetchLoop();
-
-      port.postMessage('quit');
-      return;
+        port.postMessage('quit');
+        // Destroying the execution context while fetch is happening should not cause a crash.
+        fetch('dummy.html').then(function() {}).catch(function() {});
+        self.close();
+        return;
     }
     var target = testTargets.shift();
     fetch(target)

diff --git a/LayoutTests/http/tests/serviceworker/resources/interfaces-worker.js b/LayoutTests/http/tests/serviceworker/resources/interfaces-worker.js
@@ -9,7 +9,6 @@ test(function() {
                     {
                         scope: 'string',
                         clients: 'object',
-                        close: 'function',
 
                         onactivate: EVENT_HANDLER,
                         onfetch: EVENT_HANDLER,

diff --git a/LayoutTests/http/tests/serviceworker/resources/serviceworkerglobalscope-close-worker.js b/LayoutTests/http/tests/serviceworker/resources/serviceworkerglobalscope-close-worker.js
diff --git a/LayoutTests/http/tests/serviceworker/serviceworkerglobalscope-close.html b/LayoutTests/http/tests/serviceworker/serviceworkerglobalscope-close.html
diff --git a/LayoutTests/http/tests/serviceworker/serviceworkerobject-terminate.html b/LayoutTests/http/tests/serviceworker/serviceworkerobject-terminate.html
diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -85,11 +85,6 @@ void ServiceWorker::postMessage(ExecutionContext*, PassRefPtr<SerializedScriptVa
     m_outerWorker->postMessage(messageString, webChannels.leakPtr());
 }
 
-void ServiceWorker::terminate(ExceptionState& exceptionState)
-{
-    exceptionState.throwDOMException(InvalidAccessError, "Not supported.");
-}
-
 bool ServiceWorker::isReady()
 {
     return m_proxyState == Ready;

diff --git a/Source/modules/serviceworkers/ServiceWorker.h b/Source/modules/serviceworkers/ServiceWorker.h
@@ -56,7 +56,6 @@ class ServiceWorker FINAL : public AbstractWorker, public WebServiceWorkerProxy
     static void dispose(WebType*);
 
     void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionState&);
-    void terminate(ExceptionState&);
 
     String scriptURL() const;
     const AtomicString& state() const;

diff --git a/Source/modules/serviceworkers/ServiceWorker.idl b/Source/modules/serviceworkers/ServiceWorker.idl
@@ -47,8 +47,6 @@ enum ServiceWorkerState {
     // FIXME: Should inherit this from Worker.
     [Custom, RaisesException] void postMessage(SerializedScriptValue message, optional sequence<Transferable> transfer);
 
-    [RaisesException] void terminate();
-
     readonly attribute ScalarValueString scriptURL;
     readonly attribute ServiceWorkerState  state;
 

diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
@@ -161,11 +161,6 @@ PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerGlobalScope::clients()
     return m_clients;
 }
 
-void ServiceWorkerGlobalScope::close(ExceptionState& exceptionState)
-{
-    exceptionState.throwDOMException(InvalidAccessError, "Not supported.");
-}
-
 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const
 {
     return EventTargetNames::ServiceWorkerGlobalScope;

diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
@@ -67,8 +67,6 @@ class ServiceWorkerGlobalScope FINAL : public WorkerGlobalScope {
     ScriptPromise fetch(ScriptState*, const String&);
     ScriptPromise fetch(ScriptState*, const String&, const Dictionary&);
 
-    void close(ExceptionState&);
-
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
 

diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.idl b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.idl
@@ -43,8 +43,6 @@
   [CallWith=ScriptState] Promise fetch(DOMString request, optional Dictionary requestInitDict);
   [CallWith=ScriptState] Promise fetch(Request request, optional Dictionary requestInitDict);
 
-  [RaisesException] void close();
-
   attribute EventHandler onactivate;
   attribute EventHandler onfetch;
   attribute EventHandler oninstall;