Track whether a created WebContents has a resume pending.

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/lazy_instance.h"
@@ skipping 342 matching lines @@
                   this,
                   this),
       is_loading_(false),
       is_load_to_different_document_(false),
       crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING),
       crashed_error_code_(0),
       waiting_for_response_(false),
       load_state_(net::LOAD_STATE_IDLE, base::string16()),
       upload_size_(0),
       upload_position_(0),
+      is_resume_pending_(false),
       displayed_insecure_content_(false),
       has_accessed_initial_document_(false),
       theme_color_(SK_ColorTRANSPARENT),
       last_sent_theme_color_(SK_ColorTRANSPARENT),
       did_first_visually_non_empty_paint_(false),
       capturer_count_(0),
       should_normally_be_visible_(true),
       is_being_destroyed_(false),
       notify_disconnection_(false),
       dialog_manager_(NULL),
@@ skipping 1437 matching lines @@
 #endif
 }
 
 void WebContentsImpl::ShowCreatedWindow(int route_id,
                                         WindowOpenDisposition disposition,
                                         const gfx::Rect& initial_rect,
                                         bool user_gesture) {
   WebContentsImpl* contents = GetCreatedWindow(route_id);
   if (contents) {
     WebContentsDelegate* delegate = GetDelegate();
+    contents->SetIsResumePending();

[Maria, 2015/07/08 21:02:51]

I think it's a bit odd to keep this set if the delegate is null.

I would probably rewrite this as

if(delegate) {
  contents->SetIsResumePending();
  if (delegate->ShouldResume...())
    contents->Resume..()

  delegate->AddNewContents()
}

[gone, 2015/07/08 21:04:45]

The current codepath resumes loading of the WebContents if the delegate is NULL,
doesn't it?

[Maria, 2015/07/08 21:20:29]

Oops, you are right, I misread the code. This is fine as-is.

[jam, 2015/07/09 16:50:28]

it seems there's no need for a function, and this could be written as simply:
contents->is_resume_pending_ = true;

[gone, 2015/07/09 17:11:49]

Done.

     if (!delegate || delegate->ShouldResumeRequestsForCreatedWindow())
       contents->ResumeLoadingCreatedWebContents();
 
     if (delegate) {
       delegate->AddNewContents(
           this, contents, disposition, initial_rect, user_gesture, NULL);
     }
   }
 }
 
@@ skipping 830 matching lines @@
 
 void WebContentsImpl::ExitFullscreen() {
   // Clean up related state and initiate the fullscreen exit.
   GetRenderViewHost()->RejectMouseLockOrUnlockIfNecessary();
   ExitFullscreenMode();
 }
 
 void WebContentsImpl::ResumeLoadingCreatedWebContents() {
   // Resume blocked requests for both the RenderViewHost and RenderFrameHost.
   // TODO(brettw): It seems bogus to reach into here and initialize the host.
-  GetRenderViewHost()->Init();
-  GetMainFrame()->Init();
+  if (is_resume_pending_) {

[jam, 2015/07/09 16:50:28]

shouldn't this be a CHECK(is_resume_pending_)?

[gone, 2015/07/09 17:11:49]

It could be, but that'd require exposing an IsResumePending() function to the
WebContents (or static casting the WebContents to a WebContentsImpl) so that the
WebContentsAndroid can check it.

[jam, 2015/07/10 16:35:41]

oh, the java side always calls through to this even if it wasn't paused? i had
assumed not. if so, then fine to leave as is.

+    is_resume_pending_ = false;
+    GetRenderViewHost()->Init();
+    GetMainFrame()->Init();
+  }
 }
 
 bool WebContentsImpl::FocusLocationBarByDefault() {
   NavigationEntry* entry = controller_.GetVisibleEntry();
   if (entry && entry->GetURL() == GURL(url::kAboutBlankURL))
     return true;
   return delegate_ && delegate_->ShouldFocusLocationBarByDefault(this);
 }
 
 void WebContentsImpl::SetFocusToLocationBar(bool select_all) {
@@ skipping 1814 matching lines @@
   player_map->erase(it);
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content