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

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

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/worker/websharedworkerclient_proxy.h ('k') | content/worker/worker_thread.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/websharedworkerclient_proxy.h" 5 #include "content/worker/websharedworkerclient_proxy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "content/child/webmessageportchannel_impl.h" 10 #include "content/child/webmessageportchannel_impl.h"
11 #include "content/common/worker_messages.h" 11 #include "content/common/worker_messages.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/worker/shared_worker_devtools_agent.h" 13 #include "content/worker/shared_worker_devtools_agent.h"
14 #include "content/worker/shared_worker_permission_client_proxy.h" 14 #include "content/worker/shared_worker_permission_client_proxy.h"
15 #include "content/worker/websharedworker_stub.h" 15 #include "content/worker/websharedworker_stub.h"
16 #include "content/worker/worker_thread.h" 16 #include "content/worker/worker_thread.h"
17 #include "content/worker/worker_webapplicationcachehost_impl.h" 17 #include "content/worker/worker_webapplicationcachehost_impl.h"
18 #include "ipc/ipc_logging.h" 18 #include "ipc/ipc_logging.h"
19 #include "third_party/WebKit/public/platform/WebString.h" 19 #include "third_party/WebKit/public/platform/WebString.h"
20 #include "third_party/WebKit/public/platform/WebURL.h" 20 #include "third_party/WebKit/public/platform/WebURL.h"
21 #include "third_party/WebKit/public/web/WebDocument.h" 21 #include "third_party/WebKit/public/web/WebDocument.h"
22 #include "third_party/WebKit/public/web/WebFrame.h" 22 #include "third_party/WebKit/public/web/WebFrame.h"
23 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 23 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
24 24
25 using WebKit::WebApplicationCacheHost; 25 using blink::WebApplicationCacheHost;
26 using WebKit::WebFrame; 26 using blink::WebFrame;
27 using WebKit::WebMessagePortChannel; 27 using blink::WebMessagePortChannel;
28 using WebKit::WebMessagePortChannelArray; 28 using blink::WebMessagePortChannelArray;
29 using WebKit::WebSecurityOrigin; 29 using blink::WebSecurityOrigin;
30 using WebKit::WebString; 30 using blink::WebString;
31 using WebKit::WebWorker; 31 using blink::WebWorker;
32 using WebKit::WebSharedWorkerClient; 32 using blink::WebSharedWorkerClient;
33 33
34 namespace content { 34 namespace content {
35 35
36 // How long to wait for worker to finish after it's been told to terminate. 36 // How long to wait for worker to finish after it's been told to terminate.
37 #define kMaxTimeForRunawayWorkerSeconds 3 37 #define kMaxTimeForRunawayWorkerSeconds 3
38 38
39 WebSharedWorkerClientProxy::WebSharedWorkerClientProxy( 39 WebSharedWorkerClientProxy::WebSharedWorkerClientProxy(
40 int route_id, WebSharedWorkerStub* stub) 40 int route_id, WebSharedWorkerStub* stub)
41 : route_id_(route_id), 41 : route_id_(route_id),
42 appcache_host_id_(0), 42 appcache_host_id_(0),
43 stub_(stub), 43 stub_(stub),
44 weak_factory_(this), 44 weak_factory_(this),
45 devtools_agent_(NULL) { 45 devtools_agent_(NULL) {
46 } 46 }
47 47
48 WebSharedWorkerClientProxy::~WebSharedWorkerClientProxy() { 48 WebSharedWorkerClientProxy::~WebSharedWorkerClientProxy() {
49 } 49 }
50 50
51 void WebSharedWorkerClientProxy::workerContextClosed() { 51 void WebSharedWorkerClientProxy::workerContextClosed() {
52 Send(new WorkerHostMsg_WorkerContextClosed(route_id_)); 52 Send(new WorkerHostMsg_WorkerContextClosed(route_id_));
53 } 53 }
54 54
55 void WebSharedWorkerClientProxy::workerContextDestroyed() { 55 void WebSharedWorkerClientProxy::workerContextDestroyed() {
56 Send(new WorkerHostMsg_WorkerContextDestroyed(route_id_)); 56 Send(new WorkerHostMsg_WorkerContextDestroyed(route_id_));
57 // Tell the stub that the worker has shutdown - frees this object. 57 // Tell the stub that the worker has shutdown - frees this object.
58 if (stub_) 58 if (stub_)
59 stub_->Shutdown(); 59 stub_->Shutdown();
60 } 60 }
61 61
62 WebKit::WebNotificationPresenter* 62 blink::WebNotificationPresenter*
63 WebSharedWorkerClientProxy::notificationPresenter() { 63 WebSharedWorkerClientProxy::notificationPresenter() {
64 // TODO(johnnyg): Notifications are not yet hooked up to workers. 64 // TODO(johnnyg): Notifications are not yet hooked up to workers.
65 // Coming soon. 65 // Coming soon.
66 NOTREACHED(); 66 NOTREACHED();
67 return NULL; 67 return NULL;
68 } 68 }
69 69
70 WebApplicationCacheHost* WebSharedWorkerClientProxy::createApplicationCacheHost( 70 WebApplicationCacheHost* WebSharedWorkerClientProxy::createApplicationCacheHost(
71 WebKit::WebApplicationCacheHostClient* client) { 71 blink::WebApplicationCacheHostClient* client) {
72 WorkerWebApplicationCacheHostImpl* host = 72 WorkerWebApplicationCacheHostImpl* host =
73 new WorkerWebApplicationCacheHostImpl(stub_->appcache_init_info(), 73 new WorkerWebApplicationCacheHostImpl(stub_->appcache_init_info(),
74 client); 74 client);
75 // Remember the id of the instance we create so we have access to that 75 // Remember the id of the instance we create so we have access to that
76 // value when creating nested dedicated workers in createWorker. 76 // value when creating nested dedicated workers in createWorker.
77 appcache_host_id_ = host->host_id(); 77 appcache_host_id_ = host->host_id();
78 return host; 78 return host;
79 } 79 }
80 80
81 WebKit::WebWorkerPermissionClientProxy* 81 blink::WebWorkerPermissionClientProxy*
82 WebSharedWorkerClientProxy::createWorkerPermissionClientProxy( 82 WebSharedWorkerClientProxy::createWorkerPermissionClientProxy(
83 const WebKit::WebSecurityOrigin& origin) { 83 const blink::WebSecurityOrigin& origin) {
84 return new SharedWorkerPermissionClientProxy( 84 return new SharedWorkerPermissionClientProxy(
85 GURL(origin.toString()), origin.isUnique(), route_id_, 85 GURL(origin.toString()), origin.isUnique(), route_id_,
86 ChildThread::current()->thread_safe_sender()); 86 ChildThread::current()->thread_safe_sender());
87 } 87 }
88 88
89 // TODO(kinuko): Deprecate these methods. 89 // TODO(kinuko): Deprecate these methods.
90 bool WebSharedWorkerClientProxy::allowDatabase(WebFrame* frame, 90 bool WebSharedWorkerClientProxy::allowDatabase(WebFrame* frame,
91 const WebString& name, 91 const WebString& name,
92 const WebString& display_name, 92 const WebString& display_name,
93 unsigned long estimated_size) { 93 unsigned long estimated_size) {
94 return false; 94 return false;
95 } 95 }
96 96
97 bool WebSharedWorkerClientProxy::allowFileSystem() { 97 bool WebSharedWorkerClientProxy::allowFileSystem() {
98 return false; 98 return false;
99 } 99 }
100 100
101 bool WebSharedWorkerClientProxy::allowIndexedDB(const WebKit::WebString& name) { 101 bool WebSharedWorkerClientProxy::allowIndexedDB(const blink::WebString& name) {
102 return false; 102 return false;
103 } 103 }
104 104
105 void WebSharedWorkerClientProxy::dispatchDevToolsMessage( 105 void WebSharedWorkerClientProxy::dispatchDevToolsMessage(
106 const WebString& message) { 106 const WebString& message) {
107 if (devtools_agent_) 107 if (devtools_agent_)
108 devtools_agent_->SendDevToolsMessage(message); 108 devtools_agent_->SendDevToolsMessage(message);
109 } 109 }
110 110
111 void WebSharedWorkerClientProxy::saveDevToolsAgentState( 111 void WebSharedWorkerClientProxy::saveDevToolsAgentState(
112 const WebKit::WebString& state) { 112 const blink::WebString& state) {
113 if (devtools_agent_) 113 if (devtools_agent_)
114 devtools_agent_->SaveDevToolsAgentState(state); 114 devtools_agent_->SaveDevToolsAgentState(state);
115 } 115 }
116 116
117 bool WebSharedWorkerClientProxy::Send(IPC::Message* message) { 117 bool WebSharedWorkerClientProxy::Send(IPC::Message* message) {
118 return WorkerThread::current()->Send(message); 118 return WorkerThread::current()->Send(message);
119 } 119 }
120 120
121 void WebSharedWorkerClientProxy::EnsureWorkerContextTerminates() { 121 void WebSharedWorkerClientProxy::EnsureWorkerContextTerminates() {
122 // This shuts down the process cleanly from the perspective of the browser 122 // This shuts down the process cleanly from the perspective of the browser
123 // process, and avoids the crashed worker infobar from appearing to the new 123 // process, and avoids the crashed worker infobar from appearing to the new
124 // page. It's ok to post several of theese, because the first executed task 124 // page. It's ok to post several of theese, because the first executed task
125 // will exit the message loop and subsequent ones won't be executed. 125 // will exit the message loop and subsequent ones won't be executed.
126 base::MessageLoop::current()->PostDelayedTask( 126 base::MessageLoop::current()->PostDelayedTask(
127 FROM_HERE, 127 FROM_HERE,
128 base::Bind(&WebSharedWorkerClientProxy::workerContextDestroyed, 128 base::Bind(&WebSharedWorkerClientProxy::workerContextDestroyed,
129 weak_factory_.GetWeakPtr()), 129 weak_factory_.GetWeakPtr()),
130 base::TimeDelta::FromSeconds(kMaxTimeForRunawayWorkerSeconds)); 130 base::TimeDelta::FromSeconds(kMaxTimeForRunawayWorkerSeconds));
131 } 131 }
132 132
133 } // namespace content 133 } // namespace content
OLDNEW
« no previous file with comments | « content/worker/websharedworkerclient_proxy.h ('k') | content/worker/worker_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698