Properly initialize top controls content offset on LayerTreeHost.

cc/trees/layer_tree_host.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 "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 #include <stack>
 #include <string>
 
@@ skipping 331 matching lines @@
   float page_scale_delta =
       sync_tree->page_scale_delta() / sync_tree->sent_page_scale_delta();
   sync_tree->SetPageScaleValues(page_scale_factor_,
                                 min_page_scale_factor_,
                                 max_page_scale_factor_,
                                 page_scale_delta);
   sync_tree->set_sent_page_scale_delta(1.f);
 
   sync_tree->PassSwapPromises(&swap_promise_list_);
 
-  float top_controls_height = 0.f;
-
-  if (host_impl->top_controls_manager())
-    top_controls_height = host_impl->top_controls_manager()->controls_height();
-
   sync_tree->set_top_controls_layout_height(top_controls_layout_height_);
-  sync_tree->set_top_controls_top_offset(top_controls_content_offset_ -
-      top_controls_height);
-  sync_tree->set_top_controls_delta(
-      sync_tree->top_controls_delta() -
-          sync_tree->sent_top_controls_delta());
+  sync_tree->set_top_controls_content_offset(top_controls_content_offset_);
+  sync_tree->set_top_controls_delta(sync_tree->top_controls_delta() -
+      sync_tree->sent_top_controls_delta());
   sync_tree->set_sent_top_controls_delta(0.f);
 
   host_impl->SetUseGpuRasterization(UseGpuRasterization());
   RecordGpuRasterizationHistogram();
 
   host_impl->SetViewportSize(device_viewport_size_);
   host_impl->SetDeviceScaleFactor(device_scale_factor_);
   host_impl->SetDebugState(debug_state_);
   if (pending_page_scale_animation_) {
     host_impl->StartPageScaleAnimation(
@@ skipping 949 matching lines @@
   swap_promise_list_.push_back(swap_promise.Pass());
 }
 
 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
   for (size_t i = 0; i < swap_promise_list_.size(); i++)
     swap_promise_list_[i]->DidNotSwap(reason);
   swap_promise_list_.clear();
 }
 
 }  // namespace cc