Convert top controls to use DIP instead of PX.

Previously, scroll offset was based on screen pixels, but now
is based on screen density independent pixels.  This converts
the top controls manager to deal in DIP instead of PX.

BUG=161303


Review URL: https://chromiumcodereview.appspot.com/12095071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180089 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
index 4ff7b0d..2b4d835 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -58,11 +58,11 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTopControlsHeight)) {
         std::string controls_height_str =
             CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kTopControlsHeight);
-        int controls_height;
-        if (base::StringToInt(controls_height_str, &controls_height) && controls_height > 0)
-            settings.topControlsHeightPx = controls_height;
+        double controls_height;
+        if (base::StringToDouble(controls_height_str, &controls_height) && controls_height > 0)
+            settings.topControlsHeight = controls_height;
     }
-    if (settings.calculateTopControlsPosition && (settings.topControlsHeightPx <= 0 || !settings.compositorFrameMessage)) {
+    if (settings.calculateTopControlsPosition && (settings.topControlsHeight <= 0 || !settings.compositorFrameMessage)) {
         DCHECK(false) << "Top controls repositioning enabled without valid height or compositorFrameMessage set.";
         settings.calculateTopControlsPosition = false;
     }