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

Side by Side Diff: content/renderer/render_view_impl.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3704 matching lines...) Expand 10 before | Expand all | Expand 10 after
3715 if (!url.isEmpty()) 3715 if (!url.isEmpty())
3716 urls.push_back( 3716 urls.push_back(
3717 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3717 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3718 } 3718 }
3719 SendUpdateFaviconURL(urls); 3719 SendUpdateFaviconURL(urls);
3720 } 3720 }
3721 3721
3722 void RenderViewImpl::UpdateWebViewWithDeviceScaleFactor() { 3722 void RenderViewImpl::UpdateWebViewWithDeviceScaleFactor() {
3723 if (!webview()) 3723 if (!webview())
3724 return; 3724 return;
3725 if (webview()->mainFrame()->isWebRemoteFrame())
dcheng 2015/12/22 18:27:36 Is this a temporary workaround? Or is this one of
nasko 2015/12/22 18:31:06 The whole zoom feature needs to be updated for out
dcheng 2015/12/22 18:35:13 Maybe add a TODO to that effect?
3726 return;
3727
3725 if (IsUseZoomForDSFEnabled()) { 3728 if (IsUseZoomForDSFEnabled()) {
3726 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3729 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3727 } else { 3730 } else {
3728 webview()->setDeviceScaleFactor(device_scale_factor_); 3731 webview()->setDeviceScaleFactor(device_scale_factor_);
3729 } 3732 }
3730 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3733 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3731 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3734 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3732 } 3735 }
3733 3736
3734 } // namespace content 3737 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/shell/renderer/layout_test/leak_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698