mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Don't call OnLoadEnd for same page navigations (issue #1852)
This commit is contained in:
42
patch/patches/navigation_handle.patch
Normal file
42
patch/patches/navigation_handle.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
|
||||
index 30536bd..6fdb9a3 100644
|
||||
--- content/browser/frame_host/navigation_handle_impl.cc
|
||||
+++ content/browser/frame_host/navigation_handle_impl.cc
|
||||
@@ -223,12 +223,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
|
||||
}
|
||||
|
||||
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
|
||||
- // TODO(mkwst): Change this to check against 'READY_TO_COMMIT' once
|
||||
- // ReadyToCommitNavigation is available whether or not PlzNavigate is
|
||||
- // enabled. https://crbug.com/621856
|
||||
- CHECK_GE(state_, WILL_PROCESS_RESPONSE)
|
||||
- << "This accessor should only be called after a response has been "
|
||||
- "delivered for processing.";
|
||||
return render_frame_host_;
|
||||
}
|
||||
|
||||
diff --git content/browser/frame_host/navigation_handle_impl.h content/browser/frame_host/navigation_handle_impl.h
|
||||
index 19b6871..6e85c69 100644
|
||||
--- content/browser/frame_host/navigation_handle_impl.h
|
||||
+++ content/browser/frame_host/navigation_handle_impl.h
|
||||
@@ -300,6 +300,8 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
||||
searchable_form_encoding_ = encoding;
|
||||
}
|
||||
|
||||
+ const std::vector<GURL>& redirect_chain() const { return redirect_chain_; }
|
||||
+
|
||||
private:
|
||||
friend class NavigationHandleImplTest;
|
||||
|
||||
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
|
||||
index e496ce3..de019a8 100644
|
||||
--- content/browser/frame_host/render_frame_host_impl.cc
|
||||
+++ content/browser/frame_host/render_frame_host_impl.cc
|
||||
@@ -1139,6 +1139,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
|
||||
if (navigation_handle_) {
|
||||
navigation_handle_->set_net_error_code(
|
||||
static_cast<net::Error>(params.error_code));
|
||||
+ navigation_handle_->set_render_frame_host(this);
|
||||
}
|
||||
|
||||
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
|
Reference in New Issue
Block a user