mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Calling AddStandardScheme() is now required for custom scheme handlers due to GURL changes. - Add '--no-circular-check' flag in cef_create_projects.bat to avoid unnecessary GYP failures. - nphostapi.h moved to third_party/npapi/bindings directory. - UTF functions moved to base/utf_string_conversions.h - app/gfx directory moved to gfx - Add simple cookie jar implementation. - Enable WebGL support. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@72 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -9,7 +9,8 @@
|
||||
#include "base/message_loop.h"
|
||||
#include "base/ref_counted.h"
|
||||
#include "googleurl/src/gurl.h"
|
||||
#include "net/socket_stream/socket_stream.h"
|
||||
#include "net/socket_stream/socket_stream_job.h"
|
||||
#include "net/websockets/websocket_job.h"
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "webkit/glue/websocketstreamhandle_bridge.h"
|
||||
#include "webkit/glue/websocketstreamhandle_delegate.h"
|
||||
@ -66,7 +67,7 @@ class WebSocketStreamHandleBridgeImpl
|
||||
WebKit::WebSocketStreamHandle* handle_;
|
||||
webkit_glue::WebSocketStreamHandleDelegate* delegate_;
|
||||
|
||||
scoped_refptr<net::SocketStream> socket_;
|
||||
scoped_refptr<net::SocketStreamJob> socket_;
|
||||
// Number of pending tasks to handle net::SocketStream::Delegate methods.
|
||||
int num_pending_tasks_;
|
||||
|
||||
@ -81,6 +82,7 @@ WebSocketStreamHandleBridgeImpl::WebSocketStreamHandleBridgeImpl(
|
||||
handle_(handle),
|
||||
delegate_(delegate),
|
||||
num_pending_tasks_(0) {
|
||||
net::WebSocketJob::EnsureInit();
|
||||
}
|
||||
|
||||
WebSocketStreamHandleBridgeImpl::~WebSocketStreamHandleBridgeImpl() {
|
||||
@ -155,7 +157,7 @@ void WebSocketStreamHandleBridgeImpl::OnClose(net::SocketStream* socket) {
|
||||
|
||||
void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
|
||||
DCHECK(MessageLoop::current() == g_io_thread);
|
||||
socket_ = new net::SocketStream(url, this);
|
||||
socket_ = net::SocketStreamJob::CreateSocketStreamJob(url, this);
|
||||
socket_->set_context(g_request_context);
|
||||
socket_->Connect();
|
||||
}
|
||||
|
Reference in New Issue
Block a user