ServiceWorker: mojofy ResumeAfterDownload and AddMessageToConsole

content/renderer/service_worker/embedded_worker_dispatcher.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_dispatcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h"
 #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h"
 #include "content/renderer/service_worker/service_worker_context_client.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"

[falken, 2017/01/18 03:57:38]

nit: I think this WebConsoleMessage can be removed now

[shimazu, 2017/01/18 05:00:46]

Done.

 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
 
 namespace content {
 
 EmbeddedWorkerDispatcher::WorkerWrapper::WorkerWrapper(
     blink::WebEmbeddedWorker* worker,
     int devtools_agent_route_id)
     : worker_(worker),
       devtools_agent_(
           new EmbeddedWorkerDevToolsAgent(worker, devtools_agent_route_id)) {}
 
 EmbeddedWorkerDispatcher::WorkerWrapper::~WorkerWrapper() {}
 
 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
 
 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {}
 
 bool EmbeddedWorkerDispatcher::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message)
     IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker)
-    IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_ResumeAfterDownload,
-                        OnResumeAfterDownload)
-    IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_AddMessageToConsole,
-                        OnAddMessageToConsole)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
     int embedded_worker_id) {
   RenderThreadImpl::current()->thread_safe_sender()->Send(
       new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
   UnregisterWorker(embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
   TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStopWorker");
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   // OnStopWorker is possible to be called twice.
   if (!wrapper) {
     LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
     return;
   }
   // This should eventually call WorkerContextDestroyed. (We may need to post
   // a delayed task to forcibly abort the worker context if we find it
   // necessary)
   stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now();
   wrapper->worker()->terminateWorkerContext();
 }
 
-void EmbeddedWorkerDispatcher::OnResumeAfterDownload(int embedded_worker_id) {
-  TRACE_EVENT0("ServiceWorker",
-               "EmbeddedWorkerDispatcher::OnResumeAfterDownload");
-  WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
-  if (!wrapper) {
-    LOG(WARNING) << "Got OnResumeAfterDownload for nonexistent worker";
-    return;
-  }
-  wrapper->worker()->resumeAfterDownload();
-}
-
-void EmbeddedWorkerDispatcher::OnAddMessageToConsole(
-    int embedded_worker_id,
-    ConsoleMessageLevel level,
-    const std::string& message) {
-  WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
-  if (!wrapper)
-    return;
-  blink::WebConsoleMessage::Level target_level =
-      blink::WebConsoleMessage::LevelLog;
-  switch (level) {
-    case CONSOLE_MESSAGE_LEVEL_DEBUG:
-      target_level = blink::WebConsoleMessage::LevelDebug;
-      break;
-    case CONSOLE_MESSAGE_LEVEL_LOG:
-      target_level = blink::WebConsoleMessage::LevelLog;
-      break;
-    case CONSOLE_MESSAGE_LEVEL_WARNING:
-      target_level = blink::WebConsoleMessage::LevelWarning;
-      break;
-    case CONSOLE_MESSAGE_LEVEL_ERROR:
-      target_level = blink::WebConsoleMessage::LevelError;
-      break;
-  }
-  wrapper->worker()->addMessageToConsole(blink::WebConsoleMessage(
-      target_level, blink::WebString::fromUTF8(message)));
-}
-
 std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper>
 EmbeddedWorkerDispatcher::StartWorkerContext(
     const EmbeddedWorkerStartParams& params,
     std::unique_ptr<ServiceWorkerContextClient> context_client) {
   std::unique_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
       blink::WebEmbeddedWorker::create(context_client.release(), nullptr),
       params.worker_devtools_agent_route_id));
 
   blink::WebEmbeddedWorkerStartData start_data;
   start_data.scriptURL = params.script_url;
@@ skipping 34 matching lines @@
 void EmbeddedWorkerDispatcher::RecordStopWorkerTimer(int embedded_worker_id) {
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   DCHECK(wrapper);
   // This should eventually call WorkerContextDestroyed. (We may need to post
   // a delayed task to forcibly abort the worker context if we find it
   // necessary)
   stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now();
 }
 
 }  // namespace content