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

Unified Diff: branches/1650/src/content/worker/worker_thread.cc

Issue 103243002: Revert 238433 "Merge 233099 "Kill worker process by way of a syn..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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
« no previous file with comments | « branches/1650/src/content/worker/worker_thread.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: branches/1650/src/content/worker/worker_thread.cc
===================================================================
--- branches/1650/src/content/worker/worker_thread.cc (revision 238482)
+++ branches/1650/src/content/worker/worker_thread.cc (working copy)
@@ -13,7 +13,6 @@
#include "content/child/indexed_db/indexed_db_message_filter.h"
#include "content/child/runtime_features.h"
#include "content/child/web_database_observer_impl.h"
-#include "content/common/child_process_messages.h"
#include "content/common/worker_messages.h"
#include "content/public/common/content_switches.h"
#include "content/worker/websharedworker_stub.h"
@@ -57,13 +56,6 @@
SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line);
}
-void WorkerThread::OnShutdown() {
- // The worker process is to be shut down gracefully. Ask the browser
- // process to shut it down forcefully instead and wait on the message, so that
- // there are no races between threads when the process is shutting down.
- Send(new WorkerProcessHostMsg_ForceKillWorker());
-}
-
WorkerThread::~WorkerThread() {
}
@@ -98,15 +90,6 @@
return handled;
}
-bool WorkerThread::OnMessageReceived(const IPC::Message& msg) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(WorkerThread, msg)
- IPC_MESSAGE_HANDLER(ChildProcessMsg_Shutdown, OnShutdown)
- IPC_MESSAGE_UNHANDLED(handled = ChildThread::OnMessageReceived(msg))
- IPC_END_MESSAGE_MAP()
- return handled;
-}
-
void WorkerThread::OnCreateWorker(
const WorkerProcessMsg_CreateWorker_Params& params) {
WorkerAppCacheInitInfo appcache_init_info(
« no previous file with comments | « branches/1650/src/content/worker/worker_thread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698