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

Unified Diff: chrome/renderer/websharedworker_proxy.cc

Issue 390017: Added lifecycle management and sharing support for SharedWorkers. SharedWorkers (Closed)
Patch Set: Changed WebWorkerBase not not call a virtual function from the destructor Created 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/websharedworker_proxy.cc
diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc
index 7ad1f6106e6938939167f0f56f2065fd03439c33..1d5425fcde953cc69c4c04dd000f09de81d59f26 100644
--- a/chrome/renderer/websharedworker_proxy.cc
+++ b/chrome/renderer/websharedworker_proxy.cc
@@ -13,7 +13,7 @@ WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread,
int route_id,
int render_view_route_id)
: WebWorkerBase(child_thread, route_id, render_view_route_id),
- m_connectListener(NULL) {
+ connect_listener_(NULL) {
}
bool WebSharedWorkerProxy::isStarted() {
@@ -25,6 +25,7 @@ void WebSharedWorkerProxy::startWorkerContext(
const WebKit::WebString& name,
const WebKit::WebString& user_agent,
const WebKit::WebString& source_code) {
+ DCHECK(!isStarted());
CreateWorkerContext(script_url, true, name, user_agent, source_code);
}
@@ -49,7 +50,7 @@ void WebSharedWorkerProxy::connect(WebKit::WebMessagePortChannel* channel,
Send(new WorkerMsg_Connect(route_id_, message_port_id, MSG_ROUTING_NONE));
if (HasQueuedMessages()) {
- m_connectListener = listener;
+ connect_listener_ = listener;
} else {
listener->connected();
// The listener may free this object, so do not access the object after
@@ -70,8 +71,7 @@ void WebSharedWorkerProxy::OnWorkerCreated() {
// Inform any listener that the pending connect event has been sent
// (this can result in this object being freed).
- if (m_connectListener) {
- m_connectListener->connected();
+ if (connect_listener_) {
+ connect_listener_->connected();
}
}
-

Powered by Google App Engine
This is Rietveld 408576698