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 2b3ae3b8 (#394939)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wrapper/cef_resource_manager.h
View File

@ -159,18 +159,18 @@ class CefResourceManager :
// The below methods are called on the browser process IO thread.
explicit Request(scoped_ptr<RequestState> state);
explicit Request(SCOPED_PTR(RequestState) state);
scoped_ptr<RequestState> SendRequest();
SCOPED_PTR(RequestState) SendRequest();
bool HasState();
static void ContinueOnIOThread(scoped_ptr<RequestState> state,
static void ContinueOnIOThread(SCOPED_PTR(RequestState) state,
CefRefPtr<CefResourceHandler> handler);
static void StopOnIOThread(scoped_ptr<RequestState> state);
static void StopOnIOThread(SCOPED_PTR(RequestState) state);
// Will be non-NULL while the request is pending. Only accessed on the
// browser process IO thread.
scoped_ptr<RequestState> state_;
SCOPED_PTR(RequestState) state_;
// Params that stay with this request object. Safe to access on any thread.
RequestParams params_;
@ -343,10 +343,10 @@ class CefResourceManager :
// Methods that manage request state between requests. Called on the browser
// process IO thread.
bool SendRequest(scoped_ptr<RequestState> state);
void ContinueRequest(scoped_ptr<RequestState> state,
bool SendRequest(SCOPED_PTR(RequestState) state);
void ContinueRequest(SCOPED_PTR(RequestState) state,
CefRefPtr<CefResourceHandler> handler);
void StopRequest(scoped_ptr<RequestState> state);
void StopRequest(SCOPED_PTR(RequestState) state);
bool IncrementProvider(RequestState* state);
void DetachRequestFromProvider(RequestState* state);
void GetNextValidProvider(ProviderEntryList::iterator& iterator);
@ -365,7 +365,7 @@ class CefResourceManager :
MimeTypeResolver mime_type_resolver_;
// Must be the last member. Created and accessed on the IO thread.
scoped_ptr<base::WeakPtrFactory<CefResourceManager> > weak_ptr_factory_;
SCOPED_PTR(base::WeakPtrFactory<CefResourceManager>) weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(CefResourceManager);
};

2
include/wrapper/cef_stream_resource_handler.h
View File

@ -90,7 +90,7 @@ class CefStreamResourceHandler : public CefResourceHandler {
bool read_on_file_thread_;
class Buffer;
scoped_ptr<Buffer> buffer_;
SCOPED_PTR(Buffer) buffer_;
#ifndef NDEBUG
// Used in debug builds to verify that |buffer_| isn't being accessed on
// multiple threads at the same time.