Revert of service worker: use 200 OK for update requests even in the no update case

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * 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 70 matching lines @@
 }
 
 WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient> client, PassOwnPtr<WebWorkerContentSettingsClientProxy> ContentSettingsClient)
     : m_workerContextClient(client)
     , m_contentSettingsClient(ContentSettingsClient)
     , m_workerInspectorProxy(WorkerInspectorProxy::create())
     , m_webView(nullptr)
     , m_mainFrame(nullptr)
     , m_loadingShadowPage(false)
     , m_askedToTerminate(false)
-    , m_pauseAfterDownloadState(DontPauseAfterDownload)
     , m_waitingForDebuggerState(NotWaitingForDebugger)
 {
     runningWorkerInstances().add(this);
 }
 
 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
 {
     // Prevent onScriptLoaderFinished from deleting 'this'.
     m_askedToTerminate = true;
 
@@ skipping 16 matching lines @@
     m_mainFrame->close();
     if (m_loaderProxy)
         m_loaderProxy->detachProvider(this);
 }
 
 void WebEmbeddedWorkerImpl::startWorkerContext(
     const WebEmbeddedWorkerStartData& data)
 {
     ASSERT(!m_askedToTerminate);
     ASSERT(!m_mainScriptLoader);
-    ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload);
     m_workerStartData = data;
-    if (data.pauseAfterDownloadMode == WebEmbeddedWorkerStartData::PauseAfterDownload)
-        m_pauseAfterDownloadState = DoPauseAfterDownload;
     prepareShadowPageForLoader();
 }
 
 void WebEmbeddedWorkerImpl::terminateWorkerContext()
 {
     if (m_askedToTerminate)
         return;
     m_askedToTerminate = true;
     if (m_loadingShadowPage) {
         // This deletes 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
     if (m_mainScriptLoader) {
         m_mainScriptLoader->cancel();
         m_mainScriptLoader.clear();
         // This deletes 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
     if (!m_workerThread) {
         // The worker thread has not been created yet if the worker is asked to
-        // terminate during waiting for debugger or paused after download.
-        ASSERT(m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger || m_pauseAfterDownloadState == IsPausedAfterDownload);
+        // terminate during waiting for debugger.
+        ASSERT(m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger);
         // This deletes 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
     m_workerThread->terminate();
     m_workerInspectorProxy->workerThreadTerminated();
 }
 
-void WebEmbeddedWorkerImpl::resumeAfterDownload()
-{
-    ASSERT(!m_askedToTerminate);
-    ASSERT(m_pauseAfterDownloadState == IsPausedAfterDownload);
-
-    m_pauseAfterDownloadState = DontPauseAfterDownload;
-    startWorkerThread();
-}
-
 void WebEmbeddedWorkerImpl::attachDevTools(const WebString& hostId, int sessionId)
 {
     WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
     if (devtoolsAgent)
         devtoolsAgent->attach(hostId, sessionId);
 }
 
 void WebEmbeddedWorkerImpl::reattachDevTools(const WebString& hostId, int sessionId, const WebString& savedState)
 {
     WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
@@ skipping 60 matching lines @@
     settings->setStrictMixedContentChecking(true);
     settings->setAllowDisplayOfInsecureContent(false);
     settings->setAllowRunningOfInsecureContent(false);
     m_mainFrame = toWebLocalFrameImpl(WebLocalFrame::create(WebTreeScopeType::Document, this));
     m_webView->setMainFrame(m_mainFrame.get());
     m_mainFrame->setDevToolsAgentClient(this);
 
     // If we were asked to wait for debugger then it is the good time to do that.
     m_workerContextClient->workerReadyForInspection();
     if (m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger) {
-        m_waitingForDebuggerState = WaitingForDebugger;
+        m_waitingForDebuggerState = WaitingForDebuggerBeforeLoadingScript;
         return;
     }
 
     loadShadowPage();
 }
 
 void WebEmbeddedWorkerImpl::loadShadowPage()
 {
     // Construct substitute data source for the 'shadow page'. We only need it
     // to have same origin as the worker so the loading checks work correctly.
@@ skipping 33 matching lines @@
     // invoked and |this| might have been deleted at this point.
 }
 
 void WebEmbeddedWorkerImpl::sendProtocolMessage(int sessionId, int callId, const WebString& message, const WebString& state)
 {
     m_workerContextClient->sendDevToolsMessage(sessionId, callId, message, state);
 }
 
 void WebEmbeddedWorkerImpl::resumeStartup()
 {
-    bool wasWaiting = (m_waitingForDebuggerState == WaitingForDebugger);
+    WaitingForDebuggerState waitingForDebuggerState = m_waitingForDebuggerState;
     m_waitingForDebuggerState = NotWaitingForDebugger;
-    if (wasWaiting)
+    if (waitingForDebuggerState == WaitingForDebuggerBeforeLoadingScript)
         loadShadowPage();
+    else if (waitingForDebuggerState == WaitingForDebuggerAfterScriptLoaded)
+        startWorkerThread();
 }
 
 void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
 {
     ASSERT(m_mainScriptLoader);
+
     if (m_askedToTerminate)
         return;
 
     if (m_mainScriptLoader->failed()) {
         m_mainScriptLoader.clear();
         // This deletes 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
     m_workerContextClient->workerScriptLoaded();
 
     DEFINE_STATIC_LOCAL(CustomCountHistogram, scriptSizeHistogram, ("ServiceWorker.ScriptSize", 1000, 5000000, 50));
     scriptSizeHistogram.count(m_mainScriptLoader->script().length());
     if (m_mainScriptLoader->cachedMetadata()) {
         DEFINE_STATIC_LOCAL(CustomCountHistogram, scriptCachedMetadataSizeHistogram, ("ServiceWorker.ScriptCachedMetadataSize", 1000, 50000000, 50));
         scriptCachedMetadataSizeHistogram.count(m_mainScriptLoader->cachedMetadata()->size());
     }
 
-    if (m_pauseAfterDownloadState == DoPauseAfterDownload) {
-        m_pauseAfterDownloadState = IsPausedAfterDownload;
-        return;
-    }
     startWorkerThread();
 }
 
 void WebEmbeddedWorkerImpl::startWorkerThread()
 {
-    ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload);
     ASSERT(!m_askedToTerminate);
 
     Document* document = m_mainFrame->frame()->document();
 
     WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
     if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(document))
         startMode = PauseWorkerGlobalScopeOnStart;
 
     // FIXME: this document's origin is pristine and without any extra privileges. (crbug.com/254993)
     SecurityOrigin* starterOrigin = document->securityOrigin();
@@ skipping 21 matching lines @@
     m_mainScriptLoader.clear();
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
     m_loaderProxy = WorkerLoaderProxy::create(this);
     m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
     m_workerThread->start(startupData.release());
     m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
 }
 
 } // namespace blink