Make PageScaleFactor work for oopif subframes.

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 <map>
 #include <set>
 #include <string>
@@ skipping 41 matching lines @@
 
 typedef std::vector<UIResourceRequest> UIResourceRequestQueue;
 typedef SyncedProperty<AdditionGroup<float>> SyncedBrowserControls;
 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll;
 
 class CC_EXPORT LayerTreeImpl {
  public:
   // This is the number of times a fixed point has to be hit continuously by a
   // layer to consider it as jittering.
   enum : int { kFixedPointHitsThreshold = 3 };
-  LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl,
-                scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
-                scoped_refptr<SyncedBrowserControls> top_controls_shown_ratio,
-                scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
+  LayerTreeImpl(
+      LayerTreeHostImpl* layer_tree_host_impl,
+      scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
+      scoped_refptr<SyncedProperty<ScaleGroup>> subframe_page_scale_factor,
+      scoped_refptr<SyncedBrowserControls> top_controls_shown_ratio,
+      scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
   virtual ~LayerTreeImpl();
 
   void Shutdown();
   void ReleaseResources();
   void ReleaseTileResources();
   void RecreateTileResources();
 
   // Methods called by the layer tree that pass-through or access LTHI.
   // ---------------------------------------------------------------------------
   const LayerTreeSettings& settings() const;
@@ skipping 121 matching lines @@
 
   bool has_transparent_background() const {
     return has_transparent_background_;
   }
   void set_has_transparent_background(bool transparent) {
     has_transparent_background_ = transparent;
   }
 
   void UpdatePropertyTreeScrollingAndAnimationFromMainThread();
   void SetPageScaleOnActiveTree(float active_page_scale);
+  void SetSubframePageScaleOnActiveTree(float active_subframe_page_scale);
   void PushPageScaleFromMainThread(float page_scale_factor,
                                    float min_page_scale_factor,
                                    float max_page_scale_factor);
+  void PushPageScaleFromMainThread(float page_scale_factor,
+                                   float subframe_page_scale_factor,
+                                   float min_page_scale_factor,
+                                   float max_page_scale_factor);
   float current_page_scale_factor() const {
     return page_scale_factor()->Current(IsActiveTree());
   }
+  float GetSubframePageScaleFactor() const {
+    return subframe_page_scale_factor()->Current(IsActiveTree());
+  }
   float min_page_scale_factor() const { return min_page_scale_factor_; }
   float max_page_scale_factor() const { return max_page_scale_factor_; }
 
   float page_scale_delta() const { return page_scale_factor()->Delta(); }
 
   SyncedProperty<ScaleGroup>* page_scale_factor();
   const SyncedProperty<ScaleGroup>* page_scale_factor() const;
 
+  SyncedProperty<ScaleGroup>* subframe_page_scale_factor();
+  const SyncedProperty<ScaleGroup>* subframe_page_scale_factor() const;
+
   void SetDeviceScaleFactor(float device_scale_factor);
   float device_scale_factor() const { return device_scale_factor_; }
 
   void set_painted_device_scale_factor(float painted_device_scale_factor) {
     painted_device_scale_factor_ = painted_device_scale_factor;
   }
   float painted_device_scale_factor() const {
     return painted_device_scale_factor_;
   }
 
@@ skipping 221 matching lines @@
 
   void AddToLayerList(LayerImpl* layer);
 
   void ClearLayerList();
 
   void BuildLayerListForTesting();
 
  protected:
   float ClampPageScaleFactorToLimits(float page_scale_factor) const;
   void PushPageScaleFactorAndLimits(const float* page_scale_factor,
+                                    const float* subframe_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);
   bool IsViewportLayerId(int id) const;
   void UpdateScrollbars(int scroll_layer_id, int clip_layer_id);
   void DidUpdatePageScale();
   void PushBrowserControls(const float* top_controls_shown_ratio);
   bool ClampBrowserControlsShownRatio();
 
   LayerTreeHostImpl* layer_tree_host_impl_;
   int source_frame_number_;
   int is_first_frame_after_commit_tracker_;
   LayerImpl* root_layer_for_testing_;
   HeadsUpDisplayLayerImpl* hud_layer_;
   PropertyTrees property_trees_;
   SkColor background_color_;
   bool has_transparent_background_;
 
   int last_scrolled_layer_id_;
   int overscroll_elasticity_layer_id_;
   int page_scale_layer_id_;
   int inner_viewport_scroll_layer_id_;
   int outer_viewport_scroll_layer_id_;
 
   LayerSelection selection_;
 
   scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
+  scoped_refptr<SyncedProperty<ScaleGroup>> subframe_page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
 
   float device_scale_factor_;
   float painted_device_scale_factor_;
   gfx::ColorSpace device_color_space_;
 
   scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
 
   std::unique_ptr<OwnedLayerImplList> layers_;
@@ skipping 62 matching lines @@
 
   std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_