Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc |
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
index 4ff7b0d566dc6be2eab591f5a2489f9b2264bea9..2b4d835e0b218976fee61726622756ec72a70a34 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; |
} |