Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / layers / picture_layer_impl.h

diff --git a/src/cc/layers/picture_layer_impl.h b/src/cc/layers/picture_layer_impl.h
index 6166720..d245e42 100644 (file)
--- a/src/cc/layers/picture_layer_impl.h
+++ b/src/cc/layers/picture_layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -50,6 +51,8 @@ class CC_EXPORT PictureLayerImpl
    private:
     enum IteratorType { LOW_RES, HIGH_RES, NUM_ITERATORS };
 
+    void AdvanceToNextStage();
+
     PictureLayerImpl* layer_;
 
     struct IterationStage {
@@ -107,7 +110,7 @@ class CC_EXPORT PictureLayerImpl
                            const OcclusionTracker<LayerImpl>& occlusion_tracker,
                            AppendQuadsData* append_quads_data) OVERRIDE;
   virtual void UpdateTiles(
-      const OcclusionTracker<LayerImpl>* occlusion_tracker) OVERRIDE;
+      const Occlusion& occlusion_in_content_space) OVERRIDE;
   virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE;
   virtual void DidBecomeActive() OVERRIDE;
   virtual void DidBeginTracing() OVERRIDE;
@@ -157,8 +160,7 @@ class CC_EXPORT PictureLayerImpl
   void RemoveAllTilings();
   void SyncFromActiveLayer(const PictureLayerImpl* other);
   void AddTilingsForRasterScale();
-  void UpdateTilePriorities(
-      const OcclusionTracker<LayerImpl>* occlusion_tracker);
+  void UpdateTilePriorities(const Occlusion& occlusion_in_content_space);
   virtual bool ShouldAdjustRasterScale() const;
   virtual void RecalculateRasterScales();
   void CleanUpTilingsOnActiveLayer(
@@ -170,7 +172,6 @@ class CC_EXPORT PictureLayerImpl
   bool MarkVisibleTilesAsRequired(
       PictureLayerTiling* tiling,
       const PictureLayerTiling* optional_twin_tiling,
-      float contents_scale,
       const gfx::Rect& rect,
       const Region& missing_region) const;
   gfx::Rect GetViewportForTilePriorityInContentSpace() const;
@@ -186,8 +187,12 @@ class CC_EXPORT PictureLayerImpl
   bool CanHaveTilingWithScale(float contents_scale) const;
   void SanityCheckTilingState() const;
 
+  bool ShouldAdjustRasterScaleDuringScaleAnimations() const;
+
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
+  virtual void GetAllTilesForTracing(
+      std::set<const Tile*>* tiles) const OVERRIDE;
   virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE;
 
   virtual void UpdateIdealScales();