Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page

third_party/WebKit/Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 51 matching lines @@
 class PointerLockController;
 class ScopedPageSuspender;
 class ScrollingCoordinator;
 class Settings;
 class SpellCheckerClient;
 class ValidationMessageClient;
 class WebLayerTreeView;
 
 typedef uint64_t LinkHash;
 
-float deviceScaleFactor(LocalFrame*);
+float deviceScaleFactorDeprecated(LocalFrame*);
 
 class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
                                public Supplementable<Page>,
                                public PageVisibilityNotifier,
                                public SettingsDelegate {
   USING_GARBAGE_COLLECTED_MIXIN(Page);
   WTF_MAKE_NONCOPYABLE(Page);
   friend class Settings;
 
  public:
@@ skipping 109 matching lines @@
   // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs
   //
   // Per https://html.spec.whatwg.org/multipage/webappapis.html#pause, no loads
   // are allowed to start/continue in this state, and all background processing
   // is also suspended.
   bool suspended() const { return m_suspended; }
 
   void setPageScaleFactor(float);
   float pageScaleFactor() const;
 
-  float deviceScaleFactor() const { return m_deviceScaleFactor; }
-  void setDeviceScaleFactor(float);
+  // Corresponds to pixel density of the device where this Page is
+  // being displayed. In multi-monitor setups this can vary between pages.
+  // This value does not account for Page zoom, use LocalFrame::devicePixelRatio
+  // instead.  This is to be deprecated. Use this with caution.
+  // 1) If you need to scale the content per device scale factor, this is still
+  //    valid.  In use-zoom-for-dsf mode, this is always 1, and will be remove
+  //    when transition is complete.
+  // 2) If you want to compute the device related measure (such as device pixel
+  //    height, or the scale factor for drag image), use
+  //    ChromeClient::screenInfo() instead.
+  float deviceScaleFactorDeprecated() const { return m_deviceScaleFactor; }
+  void setDeviceScaleFactorDeprecated(float);
 
   static void allVisitedStateChanged(bool invalidateVisitedLinkHashes);
   static void visitedStateChanged(LinkHash visitedHash);
 
   void setVisibilityState(PageVisibilityState, bool);
   PageVisibilityState visibilityState() const;
   bool isPageVisible() const;
 
   bool isCursorVisible() const;
   void setIsCursorVisible(bool isVisible) { m_isCursorVisible = isVisible; }
@@ skipping 86 matching lines @@
   // Page.
   // FIXME: Most of the members of Page should move onto FrameHost.
   Member<FrameHost> m_frameHost;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink
 
 #endif  // Page_h