bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-24 07:58:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1437 changes:

Browse Source 
- Only update back/forward state for committed navigations.
- Don't change the frame URL for failed loads.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1439 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-09-12 17:40:45 +00:00
parent cc3f96967c
commit 841b31b46c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cef3/libcef/browser/browser_host_impl.cc
View File

@ -1469,7 +1469,8 @@ content::WebContents* CefBrowserHostImpl::OpenURLFromTab(
} }
void CefBrowserHostImpl::LoadingStateChanged(content::WebContents* source) { void CefBrowserHostImpl::LoadingStateChanged(content::WebContents* source) {
int current_index = web_contents_->GetController().GetCurrentEntryIndex(); int current_index =
web_contents_->GetController().GetLastCommittedEntryIndex();
int max_index = web_contents_->GetController().GetEntryCount() - 1; int max_index = web_contents_->GetController().GetEntryCount() - 1;
bool is_loading, can_go_back, can_go_forward; bool is_loading, can_go_back, can_go_forward;
@ -1885,7 +1886,7 @@ void CefBrowserHostImpl::DidFailProvisionalLoad(
content::RenderViewHost* render_view_host) { content::RenderViewHost* render_view_host) {
CefRefPtr<CefFrame> frame = GetOrCreateFrame(frame_id, CefRefPtr<CefFrame> frame = GetOrCreateFrame(frame_id,
CefFrameHostImpl::kUnspecifiedFrameId, is_main_frame, string16(), CefFrameHostImpl::kUnspecifiedFrameId, is_main_frame, string16(),
validated_url); GURL());
OnLoadError(frame, validated_url, error_code, error_description); OnLoadError(frame, validated_url, error_code, error_description);
} }