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:
Marshall Greenblatt
2014-09-26 23:48:19 +00:00
parent 418303a1ff
commit 2ba756d3e1
85 changed files with 956 additions and 1398 deletions

View File

@ -110,8 +110,11 @@ void CefBrowserImpl::GoForward() {
bool CefBrowserImpl::IsLoading() {
CEF_REQUIRE_RT_RETURN(false);
if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame())
return render_view()->GetWebView()->mainFrame()->isLoading();
if (render_view()->GetWebView()) {
blink::WebFrame* main_frame = render_view()->GetWebView()->mainFrame();
if (main_frame)
return main_frame->toWebLocalFrame()->isLoading();
}
return false;
}
@ -580,7 +583,7 @@ void CefBrowserImpl::DidCreateDataSource(blink::WebLocalFrame* frame,
content::DocumentState::FromDataSource(ds);
document_state->set_navigation_state(
content::NavigationState::CreateBrowserInitiated(-1, -1, false,
content::PAGE_TRANSITION_LINK));
ui::PAGE_TRANSITION_LINK));
}
if (frame->parent() == 0) {