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

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

Issue 2724543002: Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page (Closed)
Patch Set: Rebase Created 3 years, 10 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: 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 9f38cd1d7fae8fb22e39a071554e5ac0b8d570b0..945f27e4c99ab304fcb214c84680cb17730107fd 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2892,11 +2892,12 @@ double WebViewImpl::setZoomLevel(double zoomLevel) {
if (m_compositorDeviceScaleFactorOverride) {
// Adjust the page's DSF so that DevicePixelRatio becomes
// m_zoomFactorForDeviceScaleFactor.
- page()->setDeviceScaleFactor(m_zoomFactorForDeviceScaleFactor /
- m_compositorDeviceScaleFactorOverride);
+ page()->setDeviceScaleFactorDeprecated(
+ m_zoomFactorForDeviceScaleFactor /
+ m_compositorDeviceScaleFactorOverride);
zoomFactor *= m_compositorDeviceScaleFactorOverride;
} else {
- page()->setDeviceScaleFactor(1.f);
+ page()->setDeviceScaleFactorDeprecated(1.f);
zoomFactor *= m_zoomFactorForDeviceScaleFactor;
}
}
@@ -3008,7 +3009,7 @@ void WebViewImpl::setDeviceScaleFactor(float scaleFactor) {
if (!page())
return;
- page()->setDeviceScaleFactor(scaleFactor);
+ page()->setDeviceScaleFactorDeprecated(scaleFactor);
if (m_layerTreeView)
updateLayerTreeDeviceScaleFactor();
@@ -4024,7 +4025,7 @@ void WebViewImpl::updateLayerTreeDeviceScaleFactor() {
float deviceScaleFactor = m_compositorDeviceScaleFactorOverride
? m_compositorDeviceScaleFactorOverride
- : page()->deviceScaleFactor();
+ : page()->deviceScaleFactorDeprecated();
m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor);
}
@@ -4151,7 +4152,7 @@ float WebViewImpl::deviceScaleFactor() const {
if (!page())
return 1;
- return page()->deviceScaleFactor();
+ return page()->deviceScaleFactorDeprecated();
}
LocalFrame* WebViewImpl::focusedLocalFrameInWidget() const {
« no previous file with comments | « third_party/WebKit/Source/web/WebPluginContainerImpl.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698