Merge 22540 - Ensure that we never call into WebCore::Page static methods whe...

chrome/browser/renderer_host/browser_render_process_host.cc

Index: chrome/browser/renderer_host/browser_render_process_host.cc
===================================================================
--- chrome/browser/renderer_host/browser_render_process_host.cc	(revision 22616)
+++ chrome/browser/renderer_host/browser_render_process_host.cc	(working copy)
@@ -196,6 +196,7 @@
     : RenderProcessHost(profile),
       visible_widgets_(0),
       backgrounded_(true),
+      view_created_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(cached_dibs_cleaner_(
             base::TimeDelta::FromSeconds(5),
             this, &BrowserRenderProcessHost::ClearTransportDIBCache)),
@@ -522,11 +523,17 @@
   BadMessageTerminateProcess(msg_type, process_.handle());
 }
 
+void BrowserRenderProcessHost::ViewCreated() {
+  view_created_ = true;
+  visited_link_updater_->Update(this);
+}
+
 void BrowserRenderProcessHost::WidgetRestored() {
   // Verify we were properly backgrounded.
   DCHECK_EQ(backgrounded_, (visible_widgets_ == 0));
   visible_widgets_++;
-  visited_link_updater_->Update(this);
+  if (view_created_)
+    visited_link_updater_->Update(this);
   SetBackgrounded(false);
 }
 
Property changes on: chrome/browser/renderer_host/browser_render_process_host.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/browser_render_process_host.cc:r22540