Revert "Don't send resize messages until the renderer has been initialized."

This reverts commit r14260.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14267 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 19 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 76b8d5a..aa1b78c 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -92,6 +92,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
     : RenderWidgetHost(instance->GetProcess(), routing_id),
       instance_(instance),
       delegate_(delegate),
+      renderer_initialized_(false),
       waiting_for_drag_context_response_(false),
       debugger_attached_(false),
       enabled_bindings_(0),
@@ -199,6 +200,11 @@ bool RenderViewHost::IsRenderViewLive() const {
   return process()->channel() && renderer_initialized_;
 }
 
+void RenderViewHost::Init() {
+  RenderWidgetHost::Init();
+  renderer_initialized_ = true;
+}
+
 void RenderViewHost::NavigateToEntry(const NavigationEntry& entry,
                                      bool is_reload) {
   ViewMsg_Navigate_Params params;
@@ -860,9 +866,13 @@ void RenderViewHost::OnMsgRenderViewReady() {
 }
 
 void RenderViewHost::OnMsgRenderViewGone() {
-  // Our base class RenderWidgetHost needs to reset some stuff.
+  // Our base class RenderWidgetHouse needs to reset some stuff.
   RendererExited();
 
+  // Clearing this flag causes us to re-create the renderer when recovering
+  // from a crashed renderer.
+  renderer_initialized_ = false;
+
   delegate_->RenderViewGone(this);
   OnDebugDisconnect();
 }
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 976a434..e6e7ad11 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -424,6 +424,7 @@ class RenderViewHost : public RenderWidgetHost {
   void WindowMoveOrResizeStarted();
 
   // RenderWidgetHost public overrides.
+  virtual void Init();
   virtual void Shutdown();
   virtual bool IsRenderView() { return true; }
   virtual void OnMessageReceived(const IPC::Message& msg);
@@ -591,6 +592,11 @@ class RenderViewHost : public RenderWidgetHost {
   HostPersonalization personalization_;
 #endif
 
+  // true if a renderer has once been valid. We use this flag to display a sad
+  // tab only when we lose our renderer and not if a paint occurs during
+  // initialization.
+  bool renderer_initialized_;
+
   // true if we are currently waiting for a response for drag context
   // information.
   bool waiting_for_drag_context_response_;
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 64fb609..dd14812 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -47,8 +47,7 @@ static const int kHungRendererDelayMs = 20000;
 
 RenderWidgetHost::RenderWidgetHost(RenderProcessHost* process,
                                    int routing_id)
-    : renderer_initialized_(false),
-      view_(NULL),
+    : view_(NULL),
       process_(process),
       routing_id_(routing_id),
       is_loading_(false),
@@ -82,8 +81,6 @@ RenderWidgetHost::~RenderWidgetHost() {
 void RenderWidgetHost::Init() {
   DCHECK(process_->channel());
 
-  renderer_initialized_ = true;
-
   // Send the ack along with the information on placement.
   gfx::NativeView plugin_view = view_->GetPluginNativeView();
   Send(new ViewMsg_CreatingNew_ACK(routing_id_,
@@ -162,10 +159,8 @@ void RenderWidgetHost::WasRestored() {
 }
 
 void RenderWidgetHost::WasResized() {
-  if (resize_ack_pending_ || !process_->channel() || !view_ ||
-      !renderer_initialized_) {
+  if (resize_ack_pending_ || !process_->channel() || !view_)
     return;
-  }
 
   gfx::Rect view_bounds = view_->GetViewBounds();
   gfx::Size new_size(view_bounds.width(), view_bounds.height());
@@ -352,10 +347,6 @@ void RenderWidgetHost::ForwardInputEvent(const WebInputEvent& input_event,
 }
 
 void RenderWidgetHost::RendererExited() {
-  // Clearing this flag causes us to re-create the renderer when recovering
-  // from a crashed renderer.
-  renderer_initialized_ = false;
-
   // Must reset these to ensure that mouse move events work with a new renderer.
   mouse_move_pending_ = false;
   next_mouse_move_.reset();
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index ad81ad8..b6fd4d0 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -142,7 +142,7 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   // Called when a renderer object already been created for this host, and we
   // just need to be attached to it. Used for window.open, <select> dropdown
   // menus, and other times when the renderer initiates creating an object.
-  void Init();
+  virtual void Init();
 
   // Tells the renderer to die and then calls Destroy().
   virtual void Shutdown();
@@ -282,12 +282,6 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   virtual void NotifyRendererUnresponsive() {}
   virtual void NotifyRendererResponsive() {}
 
- protected:
-  // true if a renderer has once been valid. We use this flag to display a sad
-  // tab only when we lose our renderer and not if a paint occurs during
-  // initialization.
-  bool renderer_initialized_;
-
  private:
   FRIEND_TEST(RenderWidgetHostTest, Resize);
   FRIEND_TEST(RenderWidgetHostTest, HiddenPaint);