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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

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: Move check into Blink. 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
« no previous file with comments | « third_party/WebKit/Source/web/WebLeakDetector.cpp ('k') | third_party/WebKit/public/web/WebLeakDetector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 76068fbb2bda4ace2a37a61b45fb6c84dcc71eca..84b2d6e99c4f80901dd5e75d4a559ee70a662392 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -3079,6 +3079,11 @@ double WebViewImpl::setZoomLevel(double zoomLevel)
else
m_zoomLevel = zoomLevel;
+ // TODO(nasko): Setting zoom level needs to be refactored to support
+ // out-of-process iframes. See https://crbug.com/528407.
+ if (mainFrame()->isWebRemoteFrame())
+ return m_zoomLevel;
+
LocalFrame* frame = mainFrameImpl()->frame();
if (!WebLocalFrameImpl::pluginContainerFromFrame(frame)) {
float zoomFactor = m_zoomFactorOverride ? m_zoomFactorOverride : static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
« no previous file with comments | « third_party/WebKit/Source/web/WebLeakDetector.cpp ('k') | third_party/WebKit/public/web/WebLeakDetector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698