Mark FrameHost::deviceScaleFactor as deprecated.

third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 880 matching lines @@
 
 int LocalDOMWindow::outerHeight() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
+    ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(host->chromeClient().windowRect().height() * host->deviceScaleFactor());
-    return host->chromeClient().windowRect().height();
+        return lroundf(chromeClient.windowRect().height() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.windowRect().height();
 }
 
 int LocalDOMWindow::outerWidth() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
+    ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(host->chromeClient().windowRect().width() * host->deviceScaleFactor());
-    return host->chromeClient().windowRect().width();
+        return lroundf(chromeClient.windowRect().width() * chromeClient.screenInfo().deviceScaleFactor);
+
+    return chromeClient.windowRect().width();
 }
 
 static FloatSize getViewportSize(LocalFrame* frame)
 {
     FrameView* view = frame->view();
     if (!view)
         return FloatSize();
 
     FrameHost* host = frame->host();
     if (!host)
@@ skipping 37 matching lines @@
 
 int LocalDOMWindow::screenX() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
+    ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(host->chromeClient().windowRect().x() * host->deviceScaleFactor());
-    return host->chromeClient().windowRect().x();
+        return lroundf(chromeClient.windowRect().x() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.windowRect().x();
 }
 
 int LocalDOMWindow::screenY() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
+    ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
-        return lroundf(host->chromeClient().windowRect().y() * host->deviceScaleFactor());
-    return host->chromeClient().windowRect().y();
+        return lroundf(chromeClient.windowRect().y() * chromeClient.screenInfo().deviceScaleFactor);
+    return chromeClient.windowRect().y();
 }
 
 double LocalDOMWindow::scrollX() const
 {
     if (!frame())
         return 0;
 
     FrameView* view = frame()->view();
     if (!view)
         return 0;
@@ skipping 531 matching lines @@
 {
     // If the LocalDOMWindow still has a frame reference, that frame must point
     // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
     // where script execution leaks between different LocalDOMWindows.
     if (m_frameObserver->frame())
         ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() == this);
     return m_frameObserver->frame();
 }
 
 } // namespace blink