cc: Remove low quality mode and cleanup tile versions.

cc/resources/managed_tile_state.h

 // Copyright 2013 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_RESOURCES_MANAGED_TILE_STATE_H_
 #define CC_RESOURCES_MANAGED_TILE_STATE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/platform_color.h"
-#include "cc/resources/raster_mode.h"
 #include "cc/resources/rasterizer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/tile_priority.h"
 
 namespace cc {
 
 class TileManager;
 
@@ skipping 10 matching lines @@
   NUM_BINS = 8
   // NOTE: Be sure to update ManagedTileBinAsValue and kBinPolicyMap when adding
   // or reordering fields.
 };
 scoped_ptr<base::Value> ManagedTileBinAsValue(ManagedTileBin bin);
 
 // This is state that is specific to a tile that is
 // managed by the TileManager.
 class CC_EXPORT ManagedTileState {
  public:
-  class CC_EXPORT TileVersion {
+  class CC_EXPORT TileDrawInfo {

[reveman, 2014/09/27 02:57:31]

nit: is the "Tile" prefix necessary? ManagedTileState::DrawInfo seem enough to
me. Also, can you add a comment here to explain what this class represents?
"Info" is a bit vague imo. ie. "holds all state relevant to drawing tile"

[vmpstr, 2014/09/29 14:09:50]

Done.

    public:
     enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, PICTURE_PILE_MODE };
 
-    TileVersion();
-    ~TileVersion();
+    TileDrawInfo();
+    ~TileDrawInfo();
 
     Mode mode() const { return mode_; }
 
     bool IsReadyToDraw() const;
 
     ResourceProvider::ResourceId get_resource_id() const {
       DCHECK(mode_ == RESOURCE_MODE);
       DCHECK(resource_);
 
       return resource_->id();
     }
 
     SkColor get_solid_color() const {
       DCHECK(mode_ == SOLID_COLOR_MODE);
 
       return solid_color_;
     }
 
     bool contents_swizzled() const {
       DCHECK(resource_);
       return !PlatformColor::SameComponentOrder(resource_->format());
     }
 
     bool requires_resource() const {
       return mode_ == RESOURCE_MODE || mode_ == PICTURE_PILE_MODE;
     }
 
     inline bool has_resource() const { return !!resource_; }
 
     size_t GPUMemoryUsageInBytes() const;

[reveman, 2014/09/27 02:57:31]

Does this belong here? The "draw info" has a memory usage?

[vmpstr, 2014/09/29 14:09:50]

Done (removed).

 
     void SetSolidColorForTesting(SkColor color) { set_solid_color(color); }
     void SetResourceForTesting(scoped_ptr<ScopedResource> resource) {
       resource_ = resource.Pass();
     }
 
    private:
     friend class TileManager;
     friend class PrioritizedTileSet;
     friend class Tile;
     friend class ManagedTileState;
 
     void set_use_resource() { mode_ = RESOURCE_MODE; }
 
     void set_solid_color(const SkColor& color) {
       mode_ = SOLID_COLOR_MODE;
       solid_color_ = color;
     }
 
     void set_rasterize_on_demand() { mode_ = PICTURE_PILE_MODE; }
 
     Mode mode_;
     SkColor solid_color_;
     scoped_ptr<ScopedResource> resource_;
     scoped_refptr<RasterTask> raster_task_;

[reveman, 2014/09/27 02:57:32]

Does the task belong in this class? Not really used for drawing.

[vmpstr, 2014/09/29 14:09:50]

Done (moved to mts).

   };
 
   ManagedTileState();
   ~ManagedTileState();
 
   void AsValueInto(base::debug::TracedValue* dict) const;
 
   // Persisted state: valid all the time.
-  TileVersion tile_versions[NUM_RASTER_MODES];
-  RasterMode raster_mode;
+  TileDrawInfo draw_info_;
 
   ManagedTileBin bin;
 
   TileResolution resolution;
   bool required_for_activation;
   TilePriority::PriorityBin priority_bin;
   float distance_to_visible;
   bool visible_and_ready_to_draw;
 
   // Priority for this state from the last time we assigned memory.
   unsigned scheduled_priority;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_MANAGED_TILE_STATE_H_