Identify service worker version at main resource load time.

content/renderer/service_worker/embedded_worker_context_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/pickle.h"
 #include "base/threading/thread_local.h"
+#include "content/child/service_worker/service_worker_network_provider.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/child/worker_thread_task_runner.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
+#include "content/public/renderer/document_state.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
 #include "content/renderer/service_worker/service_worker_script_context.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/web/WebDataSource.h"
 
 namespace content {
 
 namespace {
 
 // For now client must be a per-thread instance.
 // TODO(kinuko): This needs to be refactored when we start using thread pool
 // or having multiple clients per one thread.
 base::LazyInstance<base::ThreadLocalPointer<EmbeddedWorkerContextClient> >::
     Leaky g_worker_client_tls = LAZY_INSTANCE_INITIALIZER;
@@ skipping 24 matching lines @@
       main_thread_proxy_(base::MessageLoopProxy::current()),
       weak_factory_(this) {
   g_worker_client_tls.Pointer()->Set(this);
 }
 
 EmbeddedWorkerContextClient::~EmbeddedWorkerContextClient() {
   DCHECK(g_worker_client_tls.Pointer()->Get() != NULL);
   g_worker_client_tls.Pointer()->Set(NULL);
 }
 
+void EmbeddedWorkerContextClient::didCreateDataSource(
+    blink::WebDataSource* data_source) {
+  // We need to tell the network provider prior to loading the script so we
+  // get the right version.
+  ServiceWorkerNetworkProvider* provider =
+      ServiceWorkerNetworkProvider::FromDocumentState(

[michaeln, 2014/03/11 02:24:04]

We'll need to construct the provider here, not just look it up.

+          DocumentState::FromDataSource(data_source));
+  DCHECK(provider);
+  provider->SetServiceWorkerVersionId(service_worker_version_id_);
+}
+
 bool EmbeddedWorkerContextClient::OnMessageReceived(
     const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerContextClient, msg)
     IPC_MESSAGE_HANDLER(EmbeddedWorkerContextMsg_SendMessageToWorker,
                         OnSendMessageToWorker)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
@@ skipping 66 matching lines @@
 }
 
 void EmbeddedWorkerContextClient::SendWorkerStarted() {
   DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
   sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted(
       WorkerTaskRunner::Instance()->CurrentWorkerId(),
       embedded_worker_id_));
 }
 
 }  // namespace content