mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision b0aa1fb5 (#296183).
- Restore CefRenderHandler::OnScrollOffsetChanged. - Add new RT_PING and RT_SERVICE_WORKER resource type values. - The resource type for image sub-resource loads has changed from RT_IMAGE to RT_PREFETCH (this is a regression, see http://crbug.com/415253#c23). - Add a patch to fix a crash in Scheduler::swapQueuesRunPendingTasks* (http://crbug.com/415478). - Add documentation for cef_key_event_type_t values. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1846 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -19,7 +19,8 @@
|
||||
|
||||
using content::BrowserThread;
|
||||
|
||||
class CefBrowserContextProxy::CefResourceContext : public content::ResourceContext {
|
||||
class CefBrowserContextProxy::CefResourceContext :
|
||||
public content::ResourceContext {
|
||||
public:
|
||||
CefResourceContext() : getter_(NULL) {}
|
||||
virtual ~CefResourceContext() {}
|
||||
@@ -33,12 +34,6 @@ class CefBrowserContextProxy::CefResourceContext : public content::ResourceConte
|
||||
CHECK(getter_);
|
||||
return getter_->GetURLRequestContext();
|
||||
}
|
||||
virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
|
||||
return true;
|
||||
}
|
||||
virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
|
||||
return true;
|
||||
}
|
||||
|
||||
void set_url_request_context_getter(CefURLRequestContextGetterProxy* getter) {
|
||||
getter_ = getter;
|
||||
@@ -138,7 +133,7 @@ content::SSLHostStateDelegate*
|
||||
net::URLRequestContextGetter* CefBrowserContextProxy::CreateRequestContext(
|
||||
content::ProtocolHandlerMap* protocol_handlers,
|
||||
content::URLRequestInterceptorScopedVector request_interceptors) {
|
||||
DCHECK(!url_request_getter_);
|
||||
DCHECK(!url_request_getter_.get());
|
||||
url_request_getter_ =
|
||||
new CefURLRequestContextGetterProxy(handler_,
|
||||
static_cast<CefURLRequestContextGetter*>(
|
||||
|
Reference in New Issue
Block a user