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 0bfd25d4 (#381305)

Browse Source 
- Delete include/cef_runnable.h (issue #1336).
- Build the cef_unittests target using all Chromium headers. Add a
  USING_CHROMIUM_INCLUDES define and libcef_dll_wrapper_unittests
  target to support this. This change avoids compile errors due to
  the divergence of CEF and Chromium base/ header implementations.
  The libcef_dll_wrapper sources must now compile successfully with
  both CEF and Chromium base/ headers (issue #1632).
- The onbeforeunload message specified via JavaScript is no longer
  passed to the client (see http://crbug.com/587940).
This commit is contained in:
Marshall Greenblatt
2016-03-15 22:55:59 -04:00
parent 77746cfd1b
commit 243a9c26d7
152 changed files with 902 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libcef_dll/wrapper/cef_message_router.cc
View File

@ -95,7 +95,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
if (router_) {
CefPostTask(TID_UI,
base::Bind(&CefMessageRouterBrowserSideImpl::OnCallbackSuccess,
router_, browser_id_, query_id_, response));
router_.get(), browser_id_, query_id_, response));
if (!persistent_) {
// Non-persistent callbacks are only good for a single use.
@ -117,7 +117,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
if (router_) {
CefPostTask(TID_UI,
base::Bind(&CefMessageRouterBrowserSideImpl::OnCallbackFailure,
router_, browser_id_, query_id_, error_code,
router_.get(), browser_id_, query_id_, error_code,
error_message));
// Failure always invalidates the callback.

20
libcef_dll/wrapper/cef_resource_manager.cc
View File

@ -379,7 +379,7 @@ void CefResourceManager::Request::Stop() {
}
CefResourceManager::Request::Request(scoped_ptr<RequestState> state)
: state_(state.Pass()),
: state_(MOVE_SCOPED_PTR(state)),
params_(state_->params_) {
CEF_REQUIRE_IO_THREAD();
@ -401,7 +401,7 @@ scoped_ptr<CefResourceManager::RequestState>
CEF_REQUIRE_IO_THREAD();
Provider* provider = (*state_->current_entry_pos_)->provider_.get();
if (!provider->OnRequest(this))
return state_.Pass();
return MOVE_SCOPED_PTR(state_);
return scoped_ptr<RequestState>();
}
@ -418,7 +418,7 @@ void CefResourceManager::Request::ContinueOnIOThread(
// The manager may already have been deleted.
base::WeakPtr<CefResourceManager> manager = state->manager_;
if (manager)
manager->ContinueRequest(state.Pass(), handler);
manager->ContinueRequest(MOVE_SCOPED_PTR(state), handler);
}
// static
@ -428,7 +428,7 @@ void CefResourceManager::Request::StopOnIOThread(
// The manager may already have been deleted.
base::WeakPtr<CefResourceManager> manager = state->manager_;
if (manager)
manager->StopRequest(state.Pass());
manager->StopRequest(MOVE_SCOPED_PTR(state));
}
@ -611,7 +611,7 @@ cef_return_value_t CefResourceManager::OnBeforeResourceLoad(
state->current_entry_pos_ = current_entry_pos;
// If the request is potentially handled we need to continue asynchronously.
return SendRequest(state.Pass()) ? RV_CONTINUE_ASYNC : RV_CONTINUE;
return SendRequest(MOVE_SCOPED_PTR(state)) ? RV_CONTINUE_ASYNC : RV_CONTINUE;
}
CefRefPtr<CefResourceHandler> CefResourceManager::GetResourceHandler(
@ -643,7 +643,7 @@ bool CefResourceManager::SendRequest(scoped_ptr<RequestState> state) {
do {
// Should not be on the last provider entry.
DCHECK(state->current_entry_pos_ != providers_.end());
scoped_refptr<Request> request = new Request(state.Pass());
scoped_refptr<Request> request = new Request(MOVE_SCOPED_PTR(state));
// Give the provider an opportunity to handle the request.
state = request->SendRequest();
@ -651,7 +651,7 @@ bool CefResourceManager::SendRequest(scoped_ptr<RequestState> state) {
// The provider will not handle the request. Move to the next provider if
// any.
if (!IncrementProvider(state.get()))
StopRequest(state.Pass());
StopRequest(MOVE_SCOPED_PTR(state));
} else {
potentially_handled = true;
}
@ -669,13 +669,13 @@ void CefResourceManager::ContinueRequest(
// The request has been handled. Associate the request ID with the handler.
pending_handlers_.insert(
std::make_pair(state->params_.request_->GetIdentifier(), handler));
StopRequest(state.Pass());
StopRequest(MOVE_SCOPED_PTR(state));
} else {
// Move to the next provider if any.
if (IncrementProvider(state.get()))
SendRequest(state.Pass());
SendRequest(MOVE_SCOPED_PTR(state));
else
StopRequest(state.Pass());
StopRequest(MOVE_SCOPED_PTR(state));
}
}