Convert top controls to use DIP instead of PX.

webkit/compositor_bindings/web_layer_tree_view_impl.cc

 // Copyright 2011 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 "web_layer_tree_view_impl.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
@@ skipping 40 matching lines @@
     settings.initialDebugState.showFPSCounter = webSettings.showFPSCounter;
     settings.initialDebugState.showPaintRects = webSettings.showPaintRects;
     settings.initialDebugState.showPlatformLayerTree = webSettings.showPlatformLayerTree;
     settings.initialDebugState.showDebugBorders = webSettings.showDebugBorders;
     settings.implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting);
 
     settings.calculateTopControlsPosition = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTopControlsPositionCalculation);
     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;
     }
 
     m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
     if (!m_layerTreeHost.get())
         return false;
     return true;
 }
 
@@ skipping 228 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit