Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / resources / tile.h

diff --git a/src/cc/resources/tile.h b/src/cc/resources/tile.h
index 04367fd..c641367 100644 (file)
--- a/src/cc/resources/tile.h
+++ b/src/cc/resources/tile.h
@@ -6,15 +6,12 @@
 #define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "cc/base/ref_counted_managed.h"
 #include "cc/resources/managed_tile_state.h"
-#include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/raster_mode.h"
+#include "cc/resources/raster_source.h"
 #include "cc/resources/tile_priority.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
@@ -28,13 +25,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
     return id_;
   }
 
-  PicturePileImpl* picture_pile() {
-    return picture_pile_.get();
-  }
+  RasterSource* raster_source() { return raster_source_.get(); }
 
-  const PicturePileImpl* picture_pile() const {
-    return picture_pile_.get();
-  }
+  const RasterSource* raster_source() const { return raster_source_.get(); }
 
   const TilePriority& priority(WhichTree tree) const {
     return priority_[tree];
@@ -59,8 +52,11 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
                         priority_[PENDING_TREE]);
   }
 
-  void SetPriority(WhichTree tree, const TilePriority& priority);
+  void SetPriority(WhichTree tree, const TilePriority& priority) {
+    priority_[tree] = priority;
+  }
 
+  // TODO(vmpstr): Move this to the iterators.
   void set_is_occluded(WhichTree tree, bool is_occluded) {
     is_occluded_[tree] = is_occluded;
   }
@@ -84,46 +80,35 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
     }
   }
 
-  void MarkRequiredForActivation();
-
-  bool required_for_activation() const {
-    return priority_[PENDING_TREE].required_for_activation;
+  // TODO(vmpstr): Move this to the iterators.
+  bool required_for_activation() const { return required_for_activation_; }
+  void set_required_for_activation(bool is_required) {
+    required_for_activation_ = is_required;
   }
 
   bool use_picture_analysis() const {
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
-  bool NeedsRasterForMode(RasterMode mode) const {
-    return !managed_state_.tile_versions[mode].IsReadyToDraw();
-  }
-
-  bool HasResources() const {
-    for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
-      if (managed_state_.tile_versions[mode].has_resource())
-        return true;
-    }
-    return false;
+  bool HasResources() const { return managed_state_.draw_info.has_resource(); }
+  bool NeedsRaster() const {
+    return managed_state_.draw_info.mode() ==
+               ManagedTileState::DrawInfo::PICTURE_PILE_MODE ||
+           !managed_state_.draw_info.IsReadyToDraw();
   }
 
   void AsValueInto(base::debug::TracedValue* dict) const;
 
   inline bool IsReadyToDraw() const {
-    for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
-      if (managed_state_.tile_versions[mode].IsReadyToDraw())
-        return true;
-    }
-    return false;
+    return managed_state_.draw_info.IsReadyToDraw();
   }
 
-  const ManagedTileState::TileVersion& GetTileVersionForDrawing() const {
-    for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
-      if (managed_state_.tile_versions[mode].IsReadyToDraw())
-        return managed_state_.tile_versions[mode];
-    }
-    return managed_state_.tile_versions[HIGH_QUALITY_RASTER_MODE];
+  const ManagedTileState::DrawInfo& draw_info() const {
+    return managed_state_.draw_info;
   }
 
+  ManagedTileState::DrawInfo& draw_info() { return managed_state_.draw_info; }
+
   float contents_scale() const { return contents_scale_; }
   gfx::Rect content_rect() const { return content_rect_; }
 
@@ -131,28 +116,24 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
 
   int source_frame_number() const { return source_frame_number_; }
 
-  void set_picture_pile(scoped_refptr<PicturePileImpl> pile) {
-    DCHECK(pile->CanRaster(contents_scale_, content_rect_))
+  void set_raster_source(scoped_refptr<RasterSource> raster_source) {
+    DCHECK(raster_source->CoversRect(content_rect_, contents_scale_))
         << "Recording rect: "
         << gfx::ScaleToEnclosingRect(content_rect_, 1.f / contents_scale_)
                .ToString();
-    picture_pile_ = pile;
+    raster_source_ = raster_source;
   }
 
   size_t GPUMemoryUsageInBytes() const;
 
   gfx::Size size() const { return size_; }
 
-  RasterMode DetermineRasterModeForTree(WhichTree tree) const;
-  RasterMode DetermineOverallRasterMode() const;
-
-  // Functionality used in tests.
-  RasterMode GetRasterModeForTesting() const {
-    return managed_state().raster_mode;
-  }
-  ManagedTileState::TileVersion& GetTileVersionForTesting(RasterMode mode) {
-    return managed_state_.tile_versions[mode];
+  void set_tiling_index(int i, int j) {
+    tiling_i_index_ = i;
+    tiling_j_index_ = j;
   }
+  int tiling_i_index() const { return tiling_i_index_; }
+  int tiling_j_index() const { return tiling_j_index_; }
 
  private:
   friend class TileManager;
@@ -163,7 +144,7 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
 
   // Methods called by by tile manager.
   Tile(TileManager* tile_manager,
-       PicturePileImpl* picture_pile,
+       RasterSource* raster_source,
        const gfx::Size& tile_size,
        const gfx::Rect& content_rect,
        float contents_scale,
@@ -174,12 +155,11 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
 
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
-  RasterMode DetermineRasterModeForResolution(TileResolution resolution) const;
 
   bool HasRasterTask() const;
 
   TileManager* tile_manager_;
-  scoped_refptr<PicturePileImpl> picture_pile_;
+  scoped_refptr<RasterSource> raster_source_;
   gfx::Size size_;
   gfx::Rect content_rect_;
   float contents_scale_;
@@ -191,6 +171,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
   int source_frame_number_;
   int flags_;
   bool is_shared_;
+  int tiling_i_index_;
+  int tiling_j_index_;
+  bool required_for_activation_;
 
   Id id_;
   static Id s_next_id_;