| Index: content/browser/renderer_host/render_widget_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| index 46acbd1dbae6d48581ac9393358222dd4d686b81..2f7c5dc980386f4d0a11cd24f1614b97bae7b404 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -141,6 +141,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
|
| using RenderWidgetHostImpl::OnUpdateRect;
|
| using RenderWidgetHostImpl::RendererExited;
|
| using RenderWidgetHostImpl::SetInitialRenderSizeParams;
|
| + using RenderWidgetHostImpl::UpdateScreenInfo;
|
| using RenderWidgetHostImpl::old_resize_params_;
|
| using RenderWidgetHostImpl::is_hidden_;
|
| using RenderWidgetHostImpl::resize_ack_pending_;
|
| @@ -446,6 +447,7 @@ class RenderWidgetHostTest : public testing::Test {
|
|
|
| void SetInitialRenderSizeParams() {
|
| ViewMsg_Resize_Params render_size_params;
|
| + host_->UpdateScreenInfo();
|
| host_->GetResizeParams(&render_size_params);
|
| host_->SetInitialRenderSizeParams(render_size_params);
|
| }
|
| @@ -604,8 +606,8 @@ class RenderWidgetHostWithSourceTest
|
| // -----------------------------------------------------------------------------
|
|
|
| TEST_F(RenderWidgetHostTest, Resize) {
|
| - // The initial bounds is the empty rect, and the screen info hasn't been sent
|
| - // yet, so setting it to the same thing shouldn't send the resize message.
|
| + // The initial bounds is the empty rect, so setting it to the same thing
|
| + // shouldn't send the resize message.
|
| view_->set_bounds(gfx::Rect());
|
| host_->WasResized();
|
| EXPECT_FALSE(host_->resize_ack_pending_);
|
| @@ -719,6 +721,14 @@ TEST_F(RenderWidgetHostTest, Resize) {
|
| EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
|
| }
|
|
|
| +// Test that a resize event is sent if InvalidateScreenInfo() was called.
|
| +TEST_F(RenderWidgetHostTest, ResizeScreenInfo) {
|
| + host_->InvalidateScreenInfo();
|
| + host_->WasResized();
|
| + EXPECT_FALSE(host_->resize_ack_pending_);
|
| + EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
|
| +}
|
| +
|
| // Test for crbug.com/25097. If a renderer crashes between a resize and the
|
| // corresponding update message, we must be sure to clear the resize ack logic.
|
| TEST_F(RenderWidgetHostTest, ResizeThenCrash) {
|
|
|