Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2874 matching lines @@
     m_zoomLevel = zoomLevel;
 
   float zoomFactor =
       m_zoomFactorOverride
           ? m_zoomFactorOverride
           : static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
   if (m_zoomFactorForDeviceScaleFactor) {
     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;
     }
   }
   propagateZoomFactorToLocalFrameRoots(m_page->mainFrame(), zoomFactor);
 
   return m_zoomLevel;
 }
 
 void WebViewImpl::zoomLimitsChanged(double minimumZoomLevel,
                                     double maximumZoomLevel) {
@@ skipping 91 matching lines @@
   if (scaleFactor == pageScaleFactor())
     return;
 
   page()->frameHost().visualViewport().setScale(scaleFactor);
 }
 
 void WebViewImpl::setDeviceScaleFactor(float scaleFactor) {
   if (!page())
     return;
 
-  page()->setDeviceScaleFactor(scaleFactor);
+  page()->setDeviceScaleFactorDeprecated(scaleFactor);
 
   if (m_layerTreeView)
     updateLayerTreeDeviceScaleFactor();
 }
 
 void WebViewImpl::setZoomFactorForDeviceScaleFactor(
     float zoomFactorForDeviceScaleFactor) {
   m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor;
   if (!m_layerTreeView)
     return;
@@ skipping 995 matching lines @@
                                           ? m_backgroundColorOverride
                                           : backgroundColor());
 }
 
 void WebViewImpl::updateLayerTreeDeviceScaleFactor() {
   DCHECK(page());
   DCHECK(m_layerTreeView);
 
   float deviceScaleFactor = m_compositorDeviceScaleFactorOverride
                                 ? m_compositorDeviceScaleFactorOverride
-                                : page()->deviceScaleFactor();
+                                : page()->deviceScaleFactorDeprecated();
   m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor);
 }
 
 void WebViewImpl::updateDeviceEmulationTransform() {
   if (!m_visualViewportContainerLayer)
     return;
 
   // When the device emulation transform is updated, to avoid incorrect
   // scales and fuzzy raster from the compositor, force all content to
   // pick ideal raster scales.
@@ skipping 106 matching lines @@
   }
 }
 
 float WebViewImpl::deviceScaleFactor() const {
   // TODO(oshima): Investigate if this should return the ScreenInfo's scale
   // factor rather than page's scale factor, which can be 1 in use-zoom-for-dsf
   // mode.
   if (!page())
     return 1;
 
-  return page()->deviceScaleFactor();
+  return page()->deviceScaleFactorDeprecated();
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameInWidget() const {
   if (!mainFrameImpl())
     return nullptr;
 
   LocalFrame* focusedFrame = toLocalFrame(focusedCoreFrame());
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink