Fixes reloading after a background tab crashes....

chrome/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2009 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 "app/gfx/canvas.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
@@ skipping 199 matching lines @@
 };
 
 // -----------------------------------------------------------------------------
 
 TEST_F(RenderWidgetHostTest, Resize) {
   // The initial bounds is the empty rect, so setting it to the same thing
   // should do nothing.
   view_->set_bounds(gfx::Rect());
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(), host_->in_flight_size_);
   EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Setting the bounds to a "real" rect should send out the notification.
   gfx::Rect original_size(0, 0, 100, 100);
   process_->sink().ClearMessages();
   view_->set_bounds(original_size);
   host_->WasResized();
   EXPECT_TRUE(host_->resize_ack_pending_);
+  EXPECT_EQ(original_size.size(), host_->in_flight_size_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Send out a paint that's not a resize ack. This should not clean the
   // resize ack pending flag.
   ViewHostMsg_PaintRect_Params params;
   process_->InitPaintRectParams(&params);
   host_->OnMsgPaintRect(params);
   EXPECT_TRUE(host_->resize_ack_pending_);
+  EXPECT_EQ(original_size.size(), host_->in_flight_size_);
 
   // Sending out a new notification should NOT send out a new IPC message since
   // a resize ACK is pending.
   gfx::Rect second_size(0, 0, 90, 90);
   process_->sink().ClearMessages();
   view_->set_bounds(second_size);
   host_->WasResized();
   EXPECT_TRUE(host_->resize_ack_pending_);
+  EXPECT_EQ(original_size.size(), host_->in_flight_size_);
   EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Send a paint that's a resize ack, but for the original_size we sent. Since
   // this isn't the second_size, the message handler should immediately send
   // a new resize message for the new size to the renderer.
   process_->sink().ClearMessages();
   params.flags = ViewHostMsg_PaintRect_Flags::IS_RESIZE_ACK;
   params.view_size = original_size.size();
   host_->OnMsgPaintRect(params);
   EXPECT_TRUE(host_->resize_ack_pending_);
+  EXPECT_EQ(second_size.size(), host_->in_flight_size_);
   ASSERT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Send the resize ack for the latest size.
   process_->sink().ClearMessages();
   params.view_size = second_size.size();
   host_->OnMsgPaintRect(params);
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(), host_->in_flight_size_);
   ASSERT_FALSE(process_->sink().GetFirstMessageMatching(ViewMsg_Resize::ID));
 
   // Now clearing the bounds should send out a notification but we shouldn't
   // expect a resize ack (since the renderer won't ack empty sizes). The message
   // should contain the new size (0x0) and not the previous one that we skipped
   process_->sink().ClearMessages();
   view_->set_bounds(gfx::Rect());
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(), host_->in_flight_size_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Send a rect that has no area but has either width or height set.
   process_->sink().ClearMessages();
   view_->set_bounds(gfx::Rect(0, 0, 0, 30));
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(0, 30), host_->in_flight_size_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // Set the same size again. It should not be sent again.
   process_->sink().ClearMessages();
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(0, 30), host_->in_flight_size_);
   EXPECT_FALSE(process_->sink().GetFirstMessageMatching(ViewMsg_Resize::ID));
 
   // A different size should be sent again, however.
   view_->set_bounds(gfx::Rect(0, 0, 0, 31));
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(0, 31), host_->in_flight_size_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 }
 
+// Test for crbug.com/25097.  If a renderer crashes between a resize and the
+// corresponding paint message, we must be sure to clear the resize ack logic.
+TEST_F(RenderWidgetHostTest, ResizeThenCrash) {
+  // Setting the bounds to a "real" rect should send out the notification.
+  gfx::Rect original_size(0, 0, 100, 100);
+  view_->set_bounds(original_size);
+  host_->WasResized();
+  EXPECT_TRUE(host_->resize_ack_pending_);
+  EXPECT_EQ(original_size.size(), host_->in_flight_size_);
+  EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
+
+  // Simulate a renderer crash before the paint message.  Ensure all the resize
+  // ack logic is cleared.
+  host_->RendererExited();
+  EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_EQ(gfx::Size(), host_->in_flight_size_);
+
+  // Reset the view so we can exit the test cleanly.
+  view_.reset(new TestView(host_.get()));
+}
+
 // Tests setting custom background
 TEST_F(RenderWidgetHostTest, Background) {
 #if defined(OS_WIN) || defined(OS_LINUX)
   scoped_ptr<RenderWidgetHostView> view(
       RenderWidgetHostView::CreateViewForWidget(host_.get()));
   host_->set_view(view.get());
 
   // Create a checkerboard background to test with.
   gfx::Canvas canvas(4, 4, true);
   canvas.FillRectInt(SK_ColorBLACK, 0, 0, 2, 2);
@@ skipping 389 matching lines @@
     SendInputEventACK(WebInputEvent::Char, false);
     EXPECT_TRUE(host_->unhandled_keyboard_event_called());
     EXPECT_EQ(WebInputEvent::Char, host_->unhandled_keyboard_event_type());
 
     // Send the simulated response of the KeyUp event from the renderer back.
     SendInputEventACK(WebInputEvent::KeyUp, false);
     EXPECT_TRUE(host_->unhandled_keyboard_event_called());
     EXPECT_EQ(WebInputEvent::KeyUp, host_->unhandled_keyboard_event_type());
   }
 }