Navigation transitions: Block first response until after transitions have run.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f154585b299daa0eb03641e17ba460ee0c16b5bf..b5a6a0290c169566b6212514b2b46252b1d940b8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -95,6 +95,7 @@
 #include "webkit/common/webpreferences.h"
 
 #if defined(OS_ANDROID)
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/date_time_chooser_android.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/web_contents/web_contents_android.h"
@@ -3477,6 +3478,28 @@ void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
     delegate_->SwappedOut(this);
 }
 
+void WebContentsImpl::DidDeferAfterResponseStarted() {
+  if (!did_defer_callback_for_testing_.is_null()) {
+    did_defer_callback_for_testing_.Run();
+    return;
+  }
+
+#if defined(OS_ANDROID)
+  ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted();
+#endif
+}
+
+bool WebContentsImpl::WillHandleDeferAfterResponseStarted() {
+  if (!did_defer_callback_for_testing_.is_null())
+    return true;

[jam, 2014/06/16 03:46:10]

why are you stopping the code below from running in tests?

[shatch, 2014/06/16 22:32:19]

Figured for the test we already know we want to the response to defer, so we can
just return true from here immediately. The WillHandleDeferAfterResponseStarted
will just return true/false on whether the response should be deferred, but in
the case of the test that's always true but since there's no embedder here to
actually implement the transition, it'll return false and we won't get the call
to DidDeferAfterResponseStarted.

[jam, 2014/06/16 23:08:33]

Can you explain this to me some more? I think you're talking about the java side
which I'm not very familiar with.

Can the test set up a test embedder that replies true? That way we can avoid
adding test-specific code in production code.

+#if defined(OS_ANDROID)
+  return ContentViewCoreImpl::FromWebContents(this)->
+      WillHandleDeferAfterResponseStarted();
+#else
+  return false;
+#endif
+}
+
 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
   if (delegate_ && delegate_->IsPopupOrPanel(this))
     delegate_->MoveContents(this, new_bounds);
@@ -4081,4 +4104,9 @@ void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
+void WebContentsImpl::ResumeResponseDeferredAtStart() {
+  FrameTreeNode* node = frame_tree_.root();
+  node->render_manager()->ResumeResponseDeferredAtStart();
+}
+
 }  // namespace content