Fix for swapping in prerendered RenderViews with provisional data sources

chrome/renderer/render_view.cc

 // Copyright (c) 2011 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 539 matching lines @@
     : RenderWidget(render_thread, WebKit::WebPopupTypeNone),
       webkit_preferences_(webkit_prefs),
       send_content_state_immediately_(false),
       enabled_bindings_(0),
       send_preferred_size_changes_(false),
       script_can_close_(true),
       is_loading_(false),
       navigation_gesture_(NavigationGestureUnknown),
       opened_by_user_gesture_(true),
       opener_suppressed_(false),
+      is_prerendering_(false),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
       history_list_offset_(-1),
       history_list_length_(0),
       has_unload_listener_(false),
 #if defined(OS_MACOSX)
       has_document_tag_(false),
 #endif
       document_tag_(0),
@@ skipping 848 matching lines @@
         request.addHTTPHeaderField(WebString::fromUTF8(i.name()),
                                    WebString::fromUTF8(i.values()));
       }
     }
 
     if (navigation_state) {
       if (params.navigation_type != ViewMsg_Navigate_Params::PRERENDER) {
         navigation_state->set_load_type(NavigationState::NORMAL_LOAD);
       } else {
         navigation_state->set_load_type(NavigationState::PRERENDER_LOAD);
-        navigation_state->set_was_started_as_prerender(true);
-        navigation_state->set_is_prerendering(true);
+        is_prerendering_ = true;
       }
     }
     main_frame->loadRequest(request);
   }
 
   // In case LoadRequest failed before DidCreateDataSource was called.
   pending_navigation_state_.reset();
 }
 
 // Stop loading the current page
@@ skipping 1273 matching lines @@
                                    params,
                                    *group,
                                    IDR_BLOCKED_PLUGIN_HTML,
                                    IDS_PLUGIN_NOT_AUTHORIZED,
                                    false);
   }
 
   if (info.path.value() == webkit::npapi::kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
-    // Delay loading plugins if prerendering main frame.
-    WebDataSource* main_frame_ds = webview()->mainFrame()->dataSource();
-    NavigationState* navigation_state =
-        NavigationState::FromDataSource(main_frame_ds);
-    if (navigation_state->is_prerendering()) {
+    // Delay loading plugins if prerendering.
+    if (is_prerendering_) {
       return CreatePluginPlaceholder(frame,
                                      params,
                                      *group,
                                      IDR_CLICK_TO_PLAY_PLUGIN_HTML,
                                      IDS_PLUGIN_LOAD,
                                      true);
     }
 
     scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
         pepper_delegate_.CreatePepperPlugin(info.path));
@@ skipping 484 matching lines @@
   // This is for navigations within a page (didNavigateWithinPage). See
   // http://code.google.com/p/chromium/issues/detail?id=64093
   NavigationState* old_state = NavigationState::FromDataSource(ds);
   if (old_state && old_state->user_script_idle_scheduler()) {
     state->swap_user_script_idle_scheduler(old_state);
   } else {
     state->set_user_script_idle_scheduler(
         new UserScriptIdleScheduler(this, frame));
   }
 
-  // If the RenderView was prerendering before, it is still prerendering.
-  if (!frame->parent() && content_initiated) {
-    WebDataSource* ds_old = webview()->mainFrame()->dataSource();
-    if (ds_old) {
-      NavigationState* navigation_state =
-          NavigationState::FromDataSource(ds_old);
-      if (navigation_state) {
-        state->set_is_prerendering(navigation_state->is_prerendering());
-        state->set_was_started_as_prerender(
-            navigation_state->was_started_as_prerender());
-      }
-    }
-  }
+  state->set_was_started_as_prerender(is_prerendering_);
 
   ds->setExtraData(state);
 }
 
 void RenderView::didStartProvisionalLoad(WebFrame* frame) {
   WebDataSource* ds = frame->provisionalDataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
 
   // Update the request time if WebKit has better knowledge of it.
   if (navigation_state->request_time().is_null()) {
@@ skipping 1456 matching lines @@
     webview()->performCustomContextMenuAction(action);
 }
 
 void RenderView::OnInstallMissingPlugin() {
   // This could happen when the first default plugin is deleted.
   if (first_default_plugin_)
     first_default_plugin_->InstallMissingPlugin();
 }
 
 void RenderView::OnDisplayPrerenderedPage() {
-  NavigationState* navigation_state = pending_navigation_state_.get();
-  if (!navigation_state) {
-    WebDataSource* ds = webview()->mainFrame()->dataSource();
-    navigation_state = NavigationState::FromDataSource(ds);
+  DCHECK(is_prerendering_);
+  is_prerendering_ = false;
+
+  // Update NavigationState for histograms.
+  WebDataSource* ds = webview()->mainFrame()->dataSource();
+  NavigationState* navigation_state = NavigationState::FromDataSource(ds);
+  navigation_state->set_prerendered_page_display_time(Time::Now());
+
+  // If there is a provisional data source, update its NavigationState, too.
+  WebDataSource* povisional_ds =

[cbentzel, 2011/02/18 13:56:47]

provisional_ds - although at least the misspelling was consistent

[mmenke, 2011/02/18 14:53:04]

Fixed, though I prefer my more creative spelling.

+      webview()->mainFrame()->provisionalDataSource();
+  if (povisional_ds) {
+    NavigationState* provisional_navigation_state =
+        NavigationState::FromDataSource(povisional_ds);
+    if (provisional_navigation_state) {
+      provisional_navigation_state->set_prerendered_page_display_time(
+          Time::Now());
+    }
   }
-
-  DCHECK(navigation_state->is_prerendering());
-  navigation_state->set_is_prerendering(false);
-  navigation_state->set_prerendered_page_display_time(Time::Now());
 }
 
 void RenderView::OnFileChooserResponse(const std::vector<FilePath>& paths) {
   // This could happen if we navigated to a different page before the user
   // closed the chooser.
   if (file_chooser_completions_.empty())
     return;
 
   WebVector<WebString> ws_file_names(paths.size());
   for (size_t i = 0; i < paths.size(); ++i)
@@ skipping 937 matching lines @@
   }
 }
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }