Mark FrameHost::deviceScaleFactor as deprecated.

third_party/WebKit/Source/core/css/MediaValues.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/MediaValues.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/css/MediaValuesDynamic.h"
 #include "core/dom/Document.h"
@@ skipping 30 matching lines @@
 double MediaValues::calculateViewportHeight(LocalFrame* frame)
 {
     ASSERT(frame && frame->view() && frame->document());
     int viewportHeight = frame->view()->layoutSize(IncludeScrollbars).height();
     return adjustDoubleForAbsoluteZoom(viewportHeight, frame->document()->layoutViewItem().styleRef());
 }
 
 int MediaValues::calculateDeviceWidth(LocalFrame* frame)
 {
     ASSERT(frame && frame->view() && frame->settings() && frame->host());
-    int deviceWidth = frame->host()->chromeClient().screenInfo().rect.width;
+    blink::WebScreenInfo screenInfo = frame->host()->chromeClient().screenInfo();
+    int deviceWidth = screenInfo.rect.width;
     if (frame->settings()->reportScreenSizeInPhysicalPixelsQuirk())
-        deviceWidth = lroundf(deviceWidth * frame->host()->deviceScaleFactor());
+        deviceWidth = lroundf(deviceWidth * screenInfo.deviceScaleFactor);
     return deviceWidth;
 }
 
 int MediaValues::calculateDeviceHeight(LocalFrame* frame)
 {
     ASSERT(frame && frame->view() && frame->settings() && frame->host());
-    int deviceHeight = frame->host()->chromeClient().screenInfo().rect.height;
+    blink::WebScreenInfo screenInfo = frame->host()->chromeClient().screenInfo();
+    int deviceHeight = screenInfo.rect.height;
     if (frame->settings()->reportScreenSizeInPhysicalPixelsQuirk())
-        deviceHeight = lroundf(deviceHeight * frame->host()->deviceScaleFactor());
+        deviceHeight = lroundf(deviceHeight * screenInfo.deviceScaleFactor);
     return deviceHeight;
 }
 
 bool MediaValues::calculateStrictMode(LocalFrame* frame)
 {
     ASSERT(frame && frame->document());
     return !frame->document()->inQuirksMode();
 }
 
 float MediaValues::calculateDevicePixelRatio(LocalFrame* frame)
@@ skipping 135 matching lines @@
 }
 
 LocalFrame* MediaValues::frameFrom(Document& document)
 {
     Document* executingDocument = document.importsController() ? document.importsController()->master() : &document;
     ASSERT(executingDocument);
     return executingDocument->frame();
 }
 
 } // namespace blink