bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 113143.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@426 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-12-16 14:51:10 +00:00
parent 9fadd1724f
commit eff39b0f11
59 changed files with 337 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libcef/browser_socket_stream_bridge.cc
View File

@@ -14,18 +14,18 @@
#include "net/socket_stream/socket_stream_job.h"
#include "net/websockets/websocket_job.h"
#include "net/url_request/url_request_context.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketStreamHandle.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamHandle.h"
#include "webkit/glue/websocketstreamhandle_bridge.h"
#include "webkit/glue/websocketstreamhandle_delegate.h"
using webkit_glue::WebSocketStreamHandleBridge;
static const int kNoSocketId = 0;
const int kNoSocketId = 0;
namespace {
MessageLoop* g_io_thread;
scoped_refptr<net::URLRequestContext> g_request_context;
net::URLRequestContext* g_request_context;
class WebSocketStreamHandleBridgeImpl
: public WebSocketStreamHandleBridge,
@@ -223,21 +223,20 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() {
void BrowserSocketStreamBridge::InitializeOnIOThread(
net::URLRequestContext* request_context) {
g_io_thread = MessageLoop::current();
g_request_context = request_context;
if ((g_request_context = request_context))
g_request_context->AddRef();
}
void BrowserSocketStreamBridge::Cleanup() {
g_io_thread = NULL;
if (g_request_context)
g_request_context->Release();
g_request_context = NULL;
}
namespace webkit_glue {
/* static */
WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create(
webkit_glue::WebSocketStreamHandleBridge* BrowserSocketStreamBridge::Create(
WebKit::WebSocketStreamHandle* handle,
WebSocketStreamHandleDelegate* delegate) {
webkit_glue::WebSocketStreamHandleDelegate* delegate) {
return new WebSocketStreamHandleBridgeImpl(handle, delegate);
}
} // namespace webkit_glue