Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2916)

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 1804023002: Fix page zoom to be frame-centric for out-of-process frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Convert to use PageMsg instead of FrameMsg. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 1ec29e2e4bb415146c2d72df96d25e351d18f0db..7d6f3cc55db0c7dcb3be88ed1b45824f5a2d1ae7 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -365,10 +365,6 @@ class RenderViewImplTest : public RenderViewTest {
return view()->preferred_size_;
}
- void SetZoomLevel(double level) {
- view()->OnSetZoomLevelForView(false, level);
- }
-
private:
scoped_ptr<MockKeyboard> mock_keyboard_;
};
@@ -2101,7 +2097,11 @@ TEST_F(RenderViewImplTest, PreferredSizeZoomed) {
gfx::Size size = GetPreferredSize();
EXPECT_EQ(gfx::Size(400, 400), size);
- SetZoomLevel(ZoomFactorToZoomLevel(2.0));
+ double zoom_level = ZoomFactorToZoomLevel(2.0);
+ // We must call webview()->setZoomLevel() separately, since SetZoomLevel()
+ // now just notifies RenderViewObservers.
+ view()->webview()->setZoomLevel(zoom_level);
alexmos 2016/04/07 23:48:08 Is this change still necessary? You've reverted S
wjmaclean 2016/04/08 20:13:29 Done.
+
size = GetPreferredSize();
EXPECT_EQ(gfx::Size(800, 800), size);
}

Powered by Google App Engine
This is Rietveld 408576698