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

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

Issue 6691004: Move worker code from chrome\worker to content\worker. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/worker/webworkerclient_proxy.h ('k') | content/worker/worker_main.cc » ('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) 2009 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 "chrome/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 "chrome/worker/webworker_stub_base.h"
10 #include "chrome/worker/worker_thread.h"
11 #include "chrome/worker/worker_webapplicationcachehost_impl.h"
12 #include "content/common/content_switches.h" 9 #include "content/common/content_switches.h"
13 #include "content/common/file_system/file_system_dispatcher.h" 10 #include "content/common/file_system/file_system_dispatcher.h"
14 #include "content/common/file_system/webfilesystem_callback_dispatcher.h" 11 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
15 #include "content/common/webmessageportchannel_impl.h" 12 #include "content/common/webmessageportchannel_impl.h"
16 #include "content/common/worker_messages.h" 13 #include "content/common/worker_messages.h"
17 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the 14 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the
18 // 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
19 // don't support nested workers anyways. 16 // don't support nested workers anyways.
20 //#include "content/renderer/webworker_proxy.h" 17 //#include "content/renderer/webworker_proxy.h"
18 #include "content/worker/webworker_stub_base.h"
19 #include "content/worker/worker_thread.h"
20 #include "content/worker/worker_webapplicationcachehost_impl.h"
21 #include "ipc/ipc_logging.h" 21 #include "ipc/ipc_logging.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
28 28
29 using WebKit::WebApplicationCacheHost; 29 using WebKit::WebApplicationCacheHost;
30 using WebKit::WebFrame; 30 using WebKit::WebFrame;
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 // This shuts down the process cleanly from the perspective of the browser 192 // This shuts down the process cleanly from the perspective of the browser
193 // process, and avoids the crashed worker infobar from appearing to the new 193 // process, and avoids the crashed worker infobar from appearing to the new
194 // page. It's ok to post several of theese, because the first executed task 194 // page. It's ok to post several of theese, because the first executed task
195 // will exit the message loop and subsequent ones won't be executed. 195 // will exit the message loop and subsequent ones won't be executed.
196 MessageLoop::current()->PostDelayedTask(FROM_HERE, 196 MessageLoop::current()->PostDelayedTask(FROM_HERE,
197 kill_process_factory_.NewRunnableMethod( 197 kill_process_factory_.NewRunnableMethod(
198 &WebWorkerClientProxy::workerContextDestroyed), 198 &WebWorkerClientProxy::workerContextDestroyed),
199 kMaxTimeForRunawayWorkerMs); 199 kMaxTimeForRunawayWorkerMs);
200 } 200 }
OLDNEW
« no previous file with comments | « content/worker/webworkerclient_proxy.h ('k') | content/worker/worker_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698