Send resize event when the screen info changes.

content/browser/renderer_host/render_widget_host_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/timer/timer.h"
@@ skipping 560 matching lines @@
     return reinterpret_cast<const WebInputEvent*>(data);
   }
 
   base::MessageLoopForUI message_loop_;
 
   scoped_ptr<TestBrowserContext> browser_context_;
   RenderWidgetHostProcess* process_;  // Deleted automatically by the widget.
   scoped_ptr<MockRenderWidgetHostDelegate> delegate_;
   scoped_ptr<MockRenderWidgetHost> host_;
   scoped_ptr<TestView> view_;
-  scoped_ptr<gfx::Screen> screen_;
   bool handle_key_press_event_;
   bool handle_mouse_event_;
   double last_simulated_event_time_seconds_;
   double simulated_event_time_delta_seconds_;
+#if defined(USE_AURA)
+  scoped_ptr<aura::TestScreen> screen_;
+#endif
 
  private:
   SyntheticWebTouchEvent touch_event_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostTest);
 };
 
 #if GTEST_HAS_PARAM_TEST
 // RenderWidgetHostWithSourceTest ----------------------------------------------
 
 // This is for tests that are to be run for all source devices.
 class RenderWidgetHostWithSourceTest
     : public RenderWidgetHostTest,
       public testing::WithParamInterface<WebGestureDevice> {};
 #endif  // GTEST_HAS_PARAM_TEST
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 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 first  resize will send over the initial screen info.
+  host_->WasResized();
+  EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));

[sadrul, 2015/04/10 22:58:30]

ClearMessages() afterwards before the next block?

[mlamouri (slow - plz ping), 2015/04/13 11:39:08]

Done.

+
+  // 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_);
   EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 
   // No resize ack if the physical backing gets set, but the view bounds are
   // zero.
   view_->SetMockPhysicalBackingSize(gfx::Size(200, 200));
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
@@ skipping 93 matching lines @@
   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_->old_resize_params_->new_size);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 }
 
+// Test resize events with screen info changes.
+TEST_F(RenderWidgetHostTest, ResizeScreenInfo) {
+  // The first  resize will send over the initial screen info.
+  host_->WasResized();
+  EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
+
+#if defined(USE_AURA)
+  screen_->SetDisplayRotation(gfx::Display::ROTATE_180);
+#endif
+  host_->InvalidateScreenInfo();
+  EXPECT_FALSE(host_->resize_ack_pending_);
+  EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
+
+#if defined(USE_AURA)
+  screen_->SetDisplayRotation(gfx::Display::ROTATE_90);
+#endif
+  host_->InvalidateScreenInfo();
+  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) {
   // Clear the first Resize message that carried screen info.
   process_->sink().ClearMessages();
 
   // 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();
@@ skipping 761 matching lines @@
   // Having an initial size set means that the size information had been sent
   // with the reqiest to new up the RenderView and so subsequent WasResized
   // calls should not result in new IPC (unless the size has actually changed).
   host_->WasResized();
   EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
   EXPECT_EQ(initial_size_, host_->old_resize_params_->new_size);
   EXPECT_TRUE(host_->resize_ack_pending_);
 }
 
 }  // namespace content