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

Side by Side Diff: content/worker/webworkerclient_proxy.cc

Issue 8399007: Removing dedicated worker-related IPC codei (first round). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: CR feedback Created 9 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « content/worker/webworkerclient_proxy.h ('k') | content/worker/worker_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/worker/webworkerclient_proxy.h" 5 #include "content/worker/webworkerclient_proxy.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "content/common/file_system/file_system_dispatcher.h" 9 #include "content/common/file_system/file_system_dispatcher.h"
10 #include "content/common/file_system/webfilesystem_callback_dispatcher.h" 10 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
11 #include "content/common/webmessageportchannel_impl.h" 11 #include "content/common/webmessageportchannel_impl.h"
12 #include "content/common/worker_messages.h" 12 #include "content/common/worker_messages.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the 14 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the
15 // renderer worker code moves to content. This code isn't used now since we 15 // renderer worker code moves to content. This code isn't used now since we
16 // don't support nested workers anyways. 16 // don't support nested workers anyways.
17 //#include "content/renderer/webworker_proxy.h" 17 //#include "content/renderer/webworker_proxy.h"
18 #include "content/worker/shared_worker_devtools_agent.h" 18 #include "content/worker/shared_worker_devtools_agent.h"
19 #include "content/worker/webworker_stub_base.h" 19 #include "content/worker/websharedworker_stub.h"
20 #include "content/worker/worker_thread.h" 20 #include "content/worker/worker_thread.h"
21 #include "content/worker/worker_webapplicationcachehost_impl.h" 21 #include "content/worker/worker_webapplicationcachehost_impl.h"
22 #include "ipc/ipc_logging.h" 22 #include "ipc/ipc_logging.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
30 30
31 using WebKit::WebApplicationCacheHost; 31 using WebKit::WebApplicationCacheHost;
32 using WebKit::WebFrame; 32 using WebKit::WebFrame;
33 using WebKit::WebMessagePortChannel; 33 using WebKit::WebMessagePortChannel;
34 using WebKit::WebMessagePortChannelArray; 34 using WebKit::WebMessagePortChannelArray;
35 using WebKit::WebSecurityOrigin; 35 using WebKit::WebSecurityOrigin;
36 using WebKit::WebString; 36 using WebKit::WebString;
37 using WebKit::WebWorker; 37 using WebKit::WebWorker;
38 using WebKit::WebWorkerClient; 38 using WebKit::WebWorkerClient;
39 39
40 // How long to wait for worker to finish after it's been told to terminate. 40 // How long to wait for worker to finish after it's been told to terminate.
41 #define kMaxTimeForRunawayWorkerMs 3000 41 #define kMaxTimeForRunawayWorkerMs 3000
42 42
43 WebWorkerClientProxy::WebWorkerClientProxy(int route_id, 43 WebWorkerClientProxy::WebWorkerClientProxy(int route_id,
44 WebWorkerStubBase* stub) 44 WebSharedWorkerStub* stub)
45 : route_id_(route_id), 45 : route_id_(route_id),
46 appcache_host_id_(0), 46 appcache_host_id_(0),
47 stub_(stub), 47 stub_(stub),
48 ALLOW_THIS_IN_INITIALIZER_LIST(kill_process_factory_(this)), 48 ALLOW_THIS_IN_INITIALIZER_LIST(kill_process_factory_(this)),
49 devtools_agent_(NULL) { 49 devtools_agent_(NULL) {
50 } 50 }
51 51
52 WebWorkerClientProxy::~WebWorkerClientProxy() { 52 WebWorkerClientProxy::~WebWorkerClientProxy() {
53 } 53 }
54 54
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 // This shuts down the process cleanly from the perspective of the browser 207 // This shuts down the process cleanly from the perspective of the browser
208 // process, and avoids the crashed worker infobar from appearing to the new 208 // process, and avoids the crashed worker infobar from appearing to the new
209 // page. It's ok to post several of theese, because the first executed task 209 // page. It's ok to post several of theese, because the first executed task
210 // will exit the message loop and subsequent ones won't be executed. 210 // will exit the message loop and subsequent ones won't be executed.
211 MessageLoop::current()->PostDelayedTask(FROM_HERE, 211 MessageLoop::current()->PostDelayedTask(FROM_HERE,
212 kill_process_factory_.NewRunnableMethod( 212 kill_process_factory_.NewRunnableMethod(
213 &WebWorkerClientProxy::workerContextDestroyed), 213 &WebWorkerClientProxy::workerContextDestroyed),
214 kMaxTimeForRunawayWorkerMs); 214 kMaxTimeForRunawayWorkerMs);
215 } 215 }
OLDNEW
« no previous file with comments | « content/worker/webworkerclient_proxy.h ('k') | content/worker/worker_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698