cc: Moved contents_swizzled out of TileManager

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 <list>
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/resources/platform_color.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/tile_manager.h"
 
 namespace cc {
 
 // This is state that is specific to a tile that is
 // managed by the TileManager.
 class CC_EXPORT ManagedTileState {
  public:
@@ skipping 23 matching lines @@
         return resource_->id();
       }
 
       SkColor get_solid_color() const {
         DCHECK(mode_ == SOLID_COLOR_MODE);
 
         return solid_color_;
       }
 
       bool contents_swizzled() const {
-        return contents_swizzled_;
+        return !PlatformColor::SameComponentOrder(resource_format_);

[vmpstr, 2013/04/04 22:30:00]

Should we change PlatformColor functions to be hacker_style? They seem to be
fairly small functions all defined in the header.

[enne (OOO), 2013/04/04 22:37:28]

I'm pretty indifferent on this.  hacker style is optional.

+      }
+
+      void set_resource_format(GLenum format) {
+        resource_format_ = format;
       }
 
       bool requires_resource() const {
         return mode_ == RESOURCE_MODE ||
                mode_ == PICTURE_PILE_MODE;
       }
 
       scoped_ptr<ResourcePool::Resource>& GetResourceForTesting() {
         return resource_;
       }
@@ skipping 12 matching lines @@
 
       void set_solid_color(const SkColor& color) {
         mode_ = SOLID_COLOR_MODE;
         solid_color_ = color;
       }
 
       void set_rasterize_on_demand() {
         mode_ = PICTURE_PILE_MODE;
       }
 
-      void set_contents_swizzled(bool contents_swizzled) {
-        contents_swizzled_ = contents_swizzled;
-      }
-
       Mode mode_;
       SkColor solid_color_;
 
       scoped_ptr<ResourcePool::Resource> resource_;
       bool resource_is_being_initialized_;
       bool can_be_freed_;
-      bool contents_swizzled_;
+      GLenum resource_format_;

[enne (OOO), 2013/04/04 22:37:28]

Is this different than resource_->format()?

   };
 
 
   ManagedTileState();
   ~ManagedTileState();
   scoped_ptr<base::Value> AsValue() const;
 
   // Persisted state: valid all the time.
   bool can_use_gpu_memory;
   bool need_to_gather_pixel_refs;
@@ skipping 11 matching lines @@
   // to determine policy.
   TileManagerBin gpu_memmgr_stats_bin;
   TileResolution resolution;
   float time_to_needed_in_seconds;
   float distance_to_visible_in_pixels;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_MANAGED_TILE_STATE_H_