Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Unified Diff: content/browser/worker_host/worker_message_filter.cc

Issue 133093003: Move the worker script loading code to the worker process (phase:4/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02ScriptLoadInWorkerChrome
Patch Set: change comments in worker_webapplicationcachehost_impl.h and rebase. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/worker_host/worker_message_filter.cc
diff --git a/content/browser/worker_host/worker_message_filter.cc b/content/browser/worker_host/worker_message_filter.cc
index 49fe7f6f3e8a12eb387847ce883c0dc4e46c9deb..b3320947e923072cf70ba1a3c9a0467714ee8fc6 100644
--- a/content/browser/worker_host/worker_message_filter.cc
+++ b/content/browser/worker_host/worker_message_filter.cc
@@ -40,8 +40,6 @@ bool WorkerMessageFilter::OnMessageReceived(const IPC::Message& message,
// Worker messages.
// Only sent from renderer for now, until we have nested workers.
IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker)
- // Only sent from renderer for now, until we have nested workers.
- IPC_MESSAGE_HANDLER(ViewHostMsg_LookupSharedWorker, OnLookupSharedWorker)
IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToWorker, OnForwardToWorker)
// Only sent from renderer.
IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentDetached, OnDocumentDetached)
@@ -58,22 +56,12 @@ int WorkerMessageFilter::GetNextRoutingID() {
void WorkerMessageFilter::OnCreateWorker(
const ViewHostMsg_CreateWorker_Params& params,
int* route_id) {
- *route_id = params.route_id != MSG_ROUTING_NONE ?
- params.route_id : GetNextRoutingID();
- WorkerServiceImpl::GetInstance()->CreateWorker(
- params, *route_id, this, resource_context_, partition_);
-}
-
-void WorkerMessageFilter::OnLookupSharedWorker(
- const ViewHostMsg_CreateWorker_Params& params,
- bool* exists,
- int* route_id,
- bool* url_error) {
+ bool url_error = false;
*route_id = GetNextRoutingID();
-
- WorkerServiceImpl::GetInstance()->LookupSharedWorker(
- params, *route_id, this, resource_context_, partition_, exists,
- url_error);
+ WorkerServiceImpl::GetInstance()->CreateWorker(
+ params, *route_id, this, resource_context_, partition_, &url_error);
+ if (url_error)
+ *route_id = MSG_ROUTING_NONE;
}
void WorkerMessageFilter::OnForwardToWorker(const IPC::Message& message) {

Powered by Google App Engine
This is Rietveld 408576698