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 b0aa1fb5 (#296183).

Browse Source 
- 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:
Marshall Greenblatt
2014-09-26 23:48:19 +00:00
parent 418303a1ff
commit 2ba756d3e1
85 changed files with 956 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/browser/frame_host_impl.cc
View File

@@ -121,7 +121,7 @@ void CefFrameHostImpl::LoadRequest(CefRefPtr<CefRequest> request) {
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser)
if (browser.get())
browser->LoadRequest(frame_id, request);
}
@@ -135,9 +135,9 @@ void CefFrameHostImpl::LoadURL(const CefString& url) {
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser) {
if (browser.get()) {
browser->LoadURL(frame_id, url, content::Referrer(),
content::PAGE_TRANSITION_TYPED, std::string());
ui::PAGE_TRANSITION_TYPED, std::string());
}
}
@@ -152,7 +152,7 @@ void CefFrameHostImpl::LoadString(const CefString& string,
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser)
if (browser.get())
browser->LoadString(frame_id, string, url);
}
@@ -192,7 +192,7 @@ CefRefPtr<CefFrame> CefFrameHostImpl::GetParent() {
parent_frame_id = parent_frame_id_;
}
if (browser)
if (browser.get())
return browser->GetFrame(parent_frame_id);
return NULL;
@@ -252,7 +252,7 @@ void CefFrameHostImpl::SendJavaScript(
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser)
if (browser.get())
browser->SendCode(frame_id, true, jsCode, scriptUrl, startLine, NULL);
}
@@ -274,6 +274,6 @@ void CefFrameHostImpl::SendCommand(
frame_id = frame_id_;
}
if (browser && frame_id != kInvalidFrameId)
if (browser.get() && frame_id != kInvalidFrameId)
browser->SendCommand(frame_id, command, responseHandler);
}