| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index e5ca79656a9657d9035cbfd5af20dcdc6f377f36..6c6c31333451f201b64f592038fa546d4cb1d551 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -2206,6 +2206,25 @@ TEST_F(RenderViewImplTest, PreferredSizeZoomed) {
|
| EXPECT_EQ(gfx::Size(800, 800), size);
|
| }
|
|
|
| +TEST_F(RenderViewImplScaleFactorTest, PreferredSizeWithScaleFactor) {
|
| + DoSetUp();
|
| + LoadHTML("<body style='margin:0;'><div style='display:inline-block; "
|
| + "width:400px; height:400px;'/></body>");
|
| + view()->webview()->MainFrame()->ToWebLocalFrame()->SetCanHaveScrollbars(
|
| + false);
|
| + EnablePreferredSizeMode();
|
| +
|
| + gfx::Size size = GetPreferredSize();
|
| + EXPECT_EQ(gfx::Size(400, 400), size);
|
| +
|
| + // The size is in DIP. Changing the scale factor should not change
|
| + // the preferred size. (Caveat: a page may apply different layout for
|
| + // high DPI, in which case, the size may differ.)
|
| + SetDeviceScaleFactor(2.f);
|
| + size = GetPreferredSize();
|
| + EXPECT_EQ(gfx::Size(400, 400), size);
|
| +}
|
| +
|
| // Ensure the RenderViewImpl history list is properly updated when starting a
|
| // new browser-initiated navigation.
|
| TEST_F(RenderViewImplTest, HistoryIsProperlyUpdatedOnNavigation) {
|
|
|