Identify service worker version at main resource load time (BlinkSide)

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 18 matching lines @@
  */
 
 #include "config.h"
 #include "WebEmbeddedWorkerImpl.h"
 
 #include "ServiceWorkerGlobalScopeClientImpl.h"
 #include "ServiceWorkerGlobalScopeProxy.h"
 #include "WebDataSourceImpl.h"
 #include "WebFrameImpl.h"
 #include "WebServiceWorkerContextClient.h"
+#include "WebServiceWorkerNetworkProvider.h"
 #include "WebView.h"
 #include "WebWorkerPermissionClientProxy.h"
 #include "WorkerPermissionClient.h"
 #include "core/dom/Document.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/SubstituteData.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerScriptLoaderClient.h"
@@ skipping 148 matching lines @@
     WebFrameImpl* webFrame = toWebFrameImpl(m_webView->mainFrame());
 
     // 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.
     CString content("");
     int length = static_cast<int>(content.length());
     RefPtr<SharedBuffer> buffer(SharedBuffer::create(content.data(), length));
     webFrame->frame()->loader().load(FrameLoadRequest(0, ResourceRequest(m_workerStartData.scriptURL), SubstituteData(buffer, "text/html", "UTF-8", KURL())));
 }
 
+void WebEmbeddedWorkerImpl::willSendRequest(
+    WebFrame* frame, unsigned, WebURLRequest& request,
+    const WebURLResponse& redirectResponse)
+{
+    if (m_networkProvider)
+        m_networkProvider->willSendRequest(frame->dataSource(), request, redirectResponse);

[kinuko, 2014/03/17 05:21:06]

nit: you need to drop redirectResponse param here too

[michaeln, 2014/03/17 17:44:04]

Done. (ooops)

+}
+
 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebFrame* frame)
 {
     ASSERT(!m_mainScriptLoader);
+    ASSERT(!m_networkProvider);
     ASSERT(m_mainFrame);
+    ASSERT(m_workerContextClient);
+    m_networkProvider = adoptPtr(m_workerContextClient->createServiceWorkerNetworkProvider(frame->dataSource()));
     m_mainScriptLoader = Loader::create();
     m_mainScriptLoader->load(
         toWebFrameImpl(m_mainFrame)->frame()->document(),
         m_workerStartData.scriptURL,
         bind(&WebEmbeddedWorkerImpl::onScriptLoaderFinished, this));
 }
 
 void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
 {
     ASSERT(m_mainScriptLoader);
@@ skipping 31 matching lines @@
     m_mainScriptLoader.clear();
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *toWebFrameImpl(m_mainFrame)->frame()->document(), *contextClient);
     m_loaderProxy = LoaderProxy::create(*this);
 
     m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobalScopeProxy, startupData.release());
     m_workerThread->start();
 }
 
 } // namespace blink