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

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 77 matching lines @@
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/gl/gl_switches.h"
 #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"
 #include "content/public/browser/android/content_view_core.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #include "ui/gl/io_surface_support_mac.h"
 #endif
@@ skipping 3362 matching lines @@
   // Ignore this if it comes from a RenderViewHost that we aren't showing.
   if (delegate_ && rvh == GetRenderViewHost())
     delegate_->CloseContents(this);
 }
 
 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
   if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost())
     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);
 }
 
 void WebContentsImpl::DidStartLoading(RenderFrameHost* render_frame_host,
                                       bool to_different_document) {
   SetIsLoading(render_frame_host->GetRenderViewHost(), true,
                to_different_document, NULL);
 }
@@ skipping 584 matching lines @@
 }
 
 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
   if (!delegate_)
     return;
   const gfx::Size new_size = GetPreferredSize();
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
+void WebContentsImpl::ResumeResponseDeferredAtStart() {
+  FrameTreeNode* node = frame_tree_.root();
+  node->render_manager()->ResumeResponseDeferredAtStart();
+}
+
 }  // namespace content