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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 1546603003: Ensure zoom level is not updated if main frame is WebRemoteFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 f4bd85d7f52061a29559e8f9af57f7b23bceb48e..279a147d2ce81e68b697cd06d047bb6613414ae2 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -957,6 +957,23 @@ TEST_F(RenderViewImplTest, PaintAfterSwapOut) {
new_view->Release();
}
+TEST_F(RenderViewImplTest, SetZoomLevelAfterCrossProcessNavigation) {
+ // This test should only run with out-of-process iframes enabled.
+ if (!SiteIsolationPolicy::AreCrossProcessFramesPossible())
+ return;
+
+ LoadHTML("Hello world!");
+
+ // Swap the main frame out after which it should become a WebRemoteFrame.
+ TestRenderFrame* main_frame =
+ static_cast<TestRenderFrame*>(view()->GetMainRenderFrame());
+ main_frame->SwapOut(kProxyRoutingId, true, content::FrameReplicationState());
+ EXPECT_TRUE(view()->webview()->mainFrame()->isWebRemoteFrame());
+
+ // This should not cause a crash.
+ view()->OnDeviceScaleFactorChanged();
+}
+
// Test that we get the correct UpdateState message when we go back twice
// quickly without committing. Regression test for http://crbug.com/58082.
// Disabled: http://crbug.com/157357 .

Powered by Google App Engine
This is Rietveld 408576698