cc: Remove DrawQuad::IterateResoruces

cc/quads/draw_quad.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_QUADS_DRAW_QUAD_H_
 #define CC_QUADS_DRAW_QUAD_H_
 
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/shared_quad_state.h"
@@ skipping 78 matching lines @@
   bool IsDebugQuad() const { return material == DEBUG_BORDER; }
 
   bool ShouldDrawWithBlending() const {
     if (needs_blending || shared_quad_state->opacity < 1.0f)
       return true;
     if (visible_rect.IsEmpty())
       return false;
     return !opaque_rect.Contains(visible_rect);
   }
 
-  typedef base::Callback<ResourceId(ResourceId)> ResourceIteratorCallback;
-  virtual void IterateResources(const ResourceIteratorCallback& callback) = 0;
-
   // Is the left edge of this tile aligned with the originating layer's
   // left edge?
   bool IsLeftEdge() const { return !rect.x(); }
 
   // Is the top edge of this tile aligned with the originating layer's
   // top edge?
   bool IsTopEdge() const { return !rect.y(); }
 
   // Is the right edge of this tile aligned with the originating layer's
   // right edge?
   bool IsRightEdge() const {
     return rect.right() == shared_quad_state->content_bounds.width();
   }
 
   // Is the bottom edge of this tile aligned with the originating layer's
   // bottom edge?
   bool IsBottomEdge() const {
     return rect.bottom() == shared_quad_state->content_bounds.height();
   }
 
   // Is any edge of this tile aligned with the originating layer's
   // corresponding edge?
   bool IsEdge() const {
     return IsLeftEdge() || IsTopEdge() || IsRightEdge() || IsBottomEdge();
   }
 
   void AsValueInto(base::trace_event::TracedValue* value) const;
 
+  class CC_EXPORT Resources {
+   public:
+    static const size_t kMaxResourceIdCount = 4;
+
+    class Iterator {
+     public:
+      Iterator(Resources* resources, size_t index)
+          : resources_(resources), index_(index) {}
+
+      bool operator==(const Iterator& other) const {
+        return index_ == other.index_ && resources_ == other.resources_;

[danakj, 2015/05/28 20:57:37]

I know it's safer but you could drop the resources == check here probly.
Iterators from different quads don't need to be comparable?

[vmpstr, 2015/05/28 22:36:59]

Yeah I had that initially... Now I don't have the Iterator class at all.

+      }
+      bool operator!=(const Iterator& other) const { return !(*this == other); }
+
+      ResourceId& operator*() {
+        DCHECK_LT(index_, resources_->count);
+        return resources_->ids[index_];
+      }
+      const ResourceId& operator*() const {
+        DCHECK_LT(index_, resources_->count);
+        return resources_->ids[index_];
+      }
+
+      Iterator& operator++() {
+        DCHECK_LT(index_, resources_->count);
+        ++index_;
+        return *this;
+      }
+
+     private:
+      Resources* resources_;
+      size_t index_;
+    };

[piman, 2015/05/28 19:35:46]

I don't think you need this - you should be able to just do
ResourceId* begin() { return ids; }
ResourceId* end() { return ids+count; }

[danakj, 2015/05/28 20:57:37]

yaa

[vmpstr, 2015/05/28 22:36:59]

Done.

+
+    Resources();
+
+    Iterator begin() { return Iterator(this, 0); }
+    Iterator end() { return Iterator(this, count); }
+
+    bool IsCountValid() const { return count <= kMaxResourceIdCount; }

[danakj, 2015/05/28 20:57:37]

not sure why this is here?

[vmpstr, 2015/05/28 22:36:59]

This is used in cc_messages.cc. Initially I had DCHECK_LE(count,
cc::DrawQuad::Resources::kMaxResourceIdCount) there, but the linker complains
that it can't find cc::DrawQuad::Resources::kMaxResourceIdCount when it's
declared as static const. Alternatively I had declared kMaxResourceIdCount as an
enum and that worked, but it's inconsistent with enum naming.

If you know how I can make the linker happy with using the static const in
cc_messages.cc, then I can change it to that.

[danakj, 2015/05/28 23:00:15]

FWIW I'm fine with an enum with a single value that's a constant named kFoo.

+
+    size_t count;
+    ResourceId ids[kMaxResourceIdCount];
+  };
+
+  Resources resources;
+
  protected:
   DrawQuad();
 
   void SetAll(const SharedQuadState* shared_quad_state,
               Material material,
               const gfx::Rect& rect,
               const gfx::Rect& opaque_rect,
               const gfx::Rect& visible_rect,
               bool needs_blending);
   virtual void ExtendValue(base::trace_event::TracedValue* value) const = 0;
 };
 
 }  // namespace cc
 
 #endif  // CC_QUADS_DRAW_QUAD_H_