Make WebSocketStreamHandleBridge RefCountedThreadSafe.

webkit/glue/websocketstreamhandle_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // An implementation of WebSocketStreamHandle.
 
 #include "webkit/glue/websocketstreamhandle_impl.h"
 
 #include <vector>
 
@@ skipping 43 matching lines @@
   ~Context() {
     DCHECK(!handle_);
     DCHECK(!client_);
     DCHECK(!bridge_);
   }
 
   WebSocketStreamHandleImpl* handle_;
   WebKit::WebSocketStreamHandleClient* client_;
   // |bridge_| is alive from Connect to DidClose, so Context must be alive
   // in the time period.
-  WebSocketStreamHandleBridge* bridge_;
+  scoped_refptr<WebSocketStreamHandleBridge> bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle)
     : handle_(handle),
       client_(NULL),
       bridge_(NULL) {
 }
 
@@ skipping 15 matching lines @@
 void WebSocketStreamHandleImpl::Context::Close() {
   LOG(INFO) << "Close";
   if (bridge_)
     bridge_->Close();
 }
 
 void WebSocketStreamHandleImpl::Context::Detach() {
   handle_ = NULL;
   client_ = NULL;
   // If Connect was called, |bridge_| is not NULL, so that this Context closes
-  // the |bridge_| here.  Then |bridge_| will call back DidClose, in which
-  // this Context will delete the |bridge_|.
+  // the |bridge_| here.  Then |bridge_| will call back DidClose, and will
+  // be released by itself.
   // Otherwise, |bridge_| is NULL.
   if (bridge_)
     bridge_->Close();
 }
 
 void WebSocketStreamHandleImpl::Context::WillOpenStream(
     WebKit::WebSocketStreamHandle* web_handle, const GURL& url) {
   LOG(INFO) << "WillOpenStream url=" << url;
   if (client_)
     client_->willOpenStream(handle_, url);
@@ skipping 14 matching lines @@
 
 void WebSocketStreamHandleImpl::Context::DidReceiveData(
     WebKit::WebSocketStreamHandle* web_handle, const char* data, int size) {
   if (client_)
     client_->didReceiveData(handle_, WebKit::WebData(data, size));
 }
 
 void WebSocketStreamHandleImpl::Context::DidClose(
     WebKit::WebSocketStreamHandle* web_handle) {
   LOG(INFO) << "DidClose";
-  delete bridge_;
   bridge_ = NULL;
   WebSocketStreamHandleImpl* handle = handle_;
   handle_ = NULL;
   if (client_) {
     WebKit::WebSocketStreamHandleClient* client = client_;
     client_ = NULL;
     client->didClose(handle);
   }
   Release();
 }
@@ skipping 22 matching lines @@
 
 bool WebSocketStreamHandleImpl::send(const WebKit::WebData& data) {
   return context_->Send(data);
 }
 
 void WebSocketStreamHandleImpl::close() {
   context_->Close();
 }
 
 }  // namespace webkit_glue