Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 297973002: Navigation transitions: Block first response until after transitions have run. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 397fd915ea49d5281d95a1dfc2e6115228019a2d..bfeee98bd53588b5fd912e02fbeef89ebd1dda74 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -20,6 +20,7 @@
#include "content/browser/renderer_host/input/timeout_monitor.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/browser/transition_request_manager.h"
#include "content/common/desktop_notification_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
@@ -514,6 +515,17 @@ void RenderFrameHostImpl::OnCrossSiteResponse(
should_replace_current_entry);
}
+void RenderFrameHostImpl::OnDeferredAfterResponseStarted(
+ const GlobalRequestID& global_request_id) {
+ frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted(
+ global_request_id, this);
+
+ if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted())
+ frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart();
+ else
+ delegate_->DidDeferAfterResponseStarted();
+}
+
void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) {
// TODO(creis): Move swapped out state to RFH. Until then, only update it
// when swapping out the main frame.
@@ -908,4 +920,17 @@ void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone(
routing_id_, callback_context));
}
+void RenderFrameHostImpl::SetHasPendingTransitionRequest(
+ bool has_pending_request) {
+ BrowserThread::PostTask(
+ BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(
+ &TransitionRequestManager::SetHasPendingTransitionRequest,
+ base::Unretained(TransitionRequestManager::GetInstance()),
+ GetProcess()->GetID(),
+ routing_id_,
+ has_pending_request));
+}
+
} // namespace content
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698