Upstreaming prerendering changes for Android.

chrome/browser/prerender/prerender_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/prerender/prerender_config.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_origin.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "googleurl/src/gurl.h"
+#include "ui/gfx/rect.h"
 
 class Profile;
 class TabContents;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 class WebContents;
@@ skipping 126 matching lines @@
   static void SetMode(PrerenderManagerMode mode);
   static bool IsPrerenderingPossible();
   static bool ActuallyPrerendering();
   static bool IsControlGroup();
   static bool IsNoUseGroup();
 
   // Query the list of current prerender pages to see if the given web contents
   // is prerendering a page.
   bool IsWebContentsPrerendering(content::WebContents* web_contents) const;
 
+  // Returns true if there is a prerendered page for the given URL and it has
+  // finished loading. Needs to be called before MaybeUsePrerenderedPage.
+  bool DidPrerenderFinishLoading(const GURL& url);

[cbentzel, 2012/02/14 01:20:31]

const?

The comment about "Needs to be called" is also incorrect for non-Android
platforms. 

What's the rationale for not swapping in a partially-loaded prerendered page in
on Android? Visual noise? 

[Jay Civelli, 2012/02/14 03:13:51]

Done.
I am not sure I understand why this is incorrect for non-Android. Once the
prerendered tab has been swapped, the prerender manager does not know anything
about it so cannot be queried for that specific URL.
 
We do swap in that case.
It is just that Chrome for Android needs to send a notification that the page
has finished loading  (mostly for tests).
If the page has been fully prerendered, we never get that notification, so we
use this method to check for that. 

[cbentzel, 2012/02/14 10:33:36]

Ah, misinterpretation on my part. I thought you meant that
MaybeUsePrerenderedPage depended on DidPrerenderFinishLoading being called
before it, not that if DidPrerenderFinishLoading is called, it must be done
prior to MaybeUsePrerenderedPage.

[dominich, 2012/02/14 16:38:59]

It will still be swapped, but this lets the Android UI know to show a progress
spinner if loading is continuing.

+
   // Maintaining and querying the set of WebContents belonging to this
   // PrerenderManager that are currently showing prerendered pages.
   void MarkWebContentsAsPrerendered(content::WebContents* web_contents);
   void MarkWebContentsAsWouldBePrerendered(content::WebContents* web_contents);
   void MarkWebContentsAsNotPrerendered(content::WebContents* web_contents);
   bool IsWebContentsPrerendered(content::WebContents* web_contents) const;
   bool WouldWebContentsBePrerendered(content::WebContents* web_contents) const;
   bool IsOldRenderViewHost(const RenderViewHost* render_view_host) const;
 
   // Checks whether navigation to the provided URL has occurred in a visible
@@ skipping 38 matching lines @@
   // Adds a condition. This is owned by the PrerenderManager.
   void AddCondition(const PrerenderCondition* condition);
 
   bool IsTopSite(const GURL& url);
 
   bool IsPendingEntry(const GURL& url) const;
 
   // Returns true if |url| matches any URLs being prerendered.
   bool IsPrerendering(const GURL& url) const;
 
+  // The default tab bounds are used as the prerenderer tab size when the active
+  // tab could not be accessed (Android case).
+  void set_default_tab_bounds(const gfx::Rect& bounds) {

[dominich, 2012/02/14 01:11:20]

Maybe this would be better as part of the Config struct so it can be easily
overridden per platform. See prerender_config.h

[Jay Civelli, 2012/02/14 03:13:51]

Good idea! Moved to prerender_config.

+    default_tab_bounds_ = bounds;
+  }
+  gfx::Rect default_tab_bounds() const { return default_tab_bounds_; }
+
  protected:
   void SetPrerenderContentsFactory(
       PrerenderContents::Factory* prerender_contents_factory);
 
   // Utility method that is called from the virtual Shutdown method on this
   // class but is called directly from the TestPrerenderManager in the unit
   // tests.
   void DoShutdown();
 
  private:
@@ skipping 198 matching lines @@
   ScopedVector<OnCloseTabContentsDeleter> on_close_tab_contents_deleters_;
 
   scoped_ptr<PrerenderHistory> prerender_history_;
 
   std::list<const PrerenderCondition*> prerender_conditions_;
 
   scoped_ptr<PrerenderHistograms> histograms_;
 
   scoped_ptr<MostVisitedSites> most_visited_;
 
+  gfx::Rect default_tab_bounds_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 PrerenderManager* FindPrerenderManagerUsingRenderProcessId(
     int render_process_id);
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_