Normalize top controls offset to (0, 1), Chromium-side.

cc/trees/layer_tree_impl.h

 // Copyright 2012 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.
 
 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 37 matching lines @@
 class PictureLayerImpl;
 class Proxy;
 class ResourceProvider;
 class TileManager;
 class UIResourceRequest;
 struct PendingPageScaleAnimation;
 struct RendererCapabilities;
 struct SelectionHandle;
 
 typedef std::vector<UIResourceRequest> UIResourceRequestQueue;
+typedef SyncedProperty<AdditionGroup<float>> SyncedTopControls;
 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll;
 
 class CC_EXPORT LayerTreeImpl {
  public:
   static scoped_ptr<LayerTreeImpl> create(
       LayerTreeHostImpl* layer_tree_host_impl,
       scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
+      scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
       scoped_refptr<SyncedElasticOverscroll> elastic_overscroll) {
-    return make_scoped_ptr(new LayerTreeImpl(
-        layer_tree_host_impl, page_scale_factor, elastic_overscroll));
+    return make_scoped_ptr(
+        new LayerTreeImpl(layer_tree_host_impl, page_scale_factor,
+                          top_controls_shown_ratio, elastic_overscroll));
   }
   virtual ~LayerTreeImpl();
 
   void Shutdown();
   void ReleaseResources();
   void RecreateResources();
 
   // Methods called by the layer tree that pass-through or access LTHI.
   // ---------------------------------------------------------------------------
   const LayerTreeSettings& settings() const;
@@ skipping 107 matching lines @@
   SyncedProperty<ScaleGroup>* page_scale_factor();
   const SyncedProperty<ScaleGroup>* page_scale_factor() const;
 
   SyncedElasticOverscroll* elastic_overscroll() {
     return elastic_overscroll_.get();
   }
   const SyncedElasticOverscroll* elastic_overscroll() const {
     return elastic_overscroll_.get();
   }
 
+  SyncedTopControls* top_controls_shown_ratio() {
+    return top_controls_shown_ratio_.get();
+  }
+  const SyncedTopControls* top_controls_shown_ratio() const {
+    return top_controls_shown_ratio_.get();
+  }
+
   // Updates draw properties and render surface layer list, as well as tile
   // priorities. Returns false if it was unable to update.
   bool UpdateDrawProperties();
 
   void set_needs_update_draw_properties() {
     needs_update_draw_properties_ = true;
   }
   bool needs_update_draw_properties() const {
     return needs_update_draw_properties_;
   }
@@ skipping 91 matching lines @@
                          const LayerSelectionBound& end);
 
   // Compute the current selection handle location and visbility with respect to
   // the viewport.
   void GetViewportSelection(ViewportSelectionBound* start,
                             ViewportSelectionBound* end);
 
   void RegisterPictureLayerImpl(PictureLayerImpl* layer);
   void UnregisterPictureLayerImpl(PictureLayerImpl* layer);
 
-  void set_top_controls_shrink_blink_size(bool shrink) {
-    top_controls_shrink_blink_size_ = shrink;
-  }
-  void set_top_controls_height(float height) { top_controls_height_ = height; }
-  void set_top_controls_content_offset(float offset) {
-    top_controls_content_offset_ = offset;
-  }
-  void set_top_controls_delta(float delta) {
-    top_controls_delta_ = delta;
-  }
-  void set_sent_top_controls_delta(float sent_delta) {
-    sent_top_controls_delta_ = sent_delta;
-  }
-
+  void set_top_controls_shrink_blink_size(bool shrink);
   bool top_controls_shrink_blink_size() const {
     return top_controls_shrink_blink_size_;
   }
+  bool SetCurrentTopControlsShownRatio(float ratio);
+  float CurrentTopControlsShownRatio() const {
+    return top_controls_shown_ratio_->Current(IsActiveTree());
+  }
+  void set_top_controls_height(float top_controls_height);
   float top_controls_height() const { return top_controls_height_; }
-  float top_controls_content_offset() const {
-    return top_controls_content_offset_;
-  }
-  float top_controls_delta() const {
-    return top_controls_delta_;
-  }
-  float sent_top_controls_delta() const {
-    return sent_top_controls_delta_;
-  }
-  float total_top_controls_content_offset() const {
-    return top_controls_content_offset_ + top_controls_delta_;
-  }
+  void PushTopControlsFromMainThread(float top_controls_shown_ratio);
 
   void SetPendingPageScaleAnimation(
       scoped_ptr<PendingPageScaleAnimation> pending_animation);
   scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
 
  protected:
   explicit LayerTreeImpl(
       LayerTreeHostImpl* layer_tree_host_impl,
       scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
+      scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
       scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
   void ProcessLayersRecursive(LayerImpl* current,
                               void (LayerImpl::*function)());
   float ClampPageScaleFactorToLimits(float page_scale_factor) const;
   void PushPageScaleFactorAndLimits(const float* page_scale_factor,
                                     float min_page_scale_factor,
                                     float max_page_scale_factor);
   bool SetPageScaleFactorLimits(float min_page_scale_factor,
                                 float max_page_scale_factor);
   void DidUpdatePageScale();
   void HideInnerViewportScrollbarsIfNearMinimumScale();
-
+  void PushTopControls(const float* top_controls_shown_ratio);
   LayerTreeHostImpl* layer_tree_host_impl_;
   int source_frame_number_;
   scoped_ptr<LayerImpl> root_layer_;
   HeadsUpDisplayLayerImpl* hud_layer_;
   LayerImpl* currently_scrolling_layer_;
   LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate_;
   scoped_ptr<LayerScrollOffsetDelegateProxy>
       inner_viewport_scroll_delegate_proxy_;
   scoped_ptr<LayerScrollOffsetDelegateProxy>
       outer_viewport_scroll_delegate_proxy_;
@@ skipping 42 matching lines @@
   UIResourceRequestQueue ui_resource_request_queue_;
 
   int render_surface_layer_list_id_;
 
   // Whether or not Blink's viewport size was shrunk by the height of the top
   // controls at the time of the last layout.
   bool top_controls_shrink_blink_size_;
 
   float top_controls_height_;
 
-  // The up-to-date content offset of the top controls, i.e. the amount that the
-  // web contents have been shifted down from the top of the device viewport.
-  float top_controls_content_offset_;
-  float top_controls_delta_;
-  float sent_top_controls_delta_;
+  // The amount that the top controls are shown from 0 (hidden) to 1 (fully
+  // shown).
+  scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
 
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_