Move cc::DisplayItemList and related classes into cc/paint/

cc/base/tiling_data.h

 // Copyright 2010 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_BASE_TILING_DATA_H_
 #define CC_BASE_TILING_DATA_H_
 
 #include <utility>
 
 #include "base/logging.h"
-#include "cc/base/cc_export.h"
+#include "cc/base/base_export.h"
 #include "cc/base/index_rect.h"
 #include "cc/base/reverse_spiral_iterator.h"
 #include "cc/base/spiral_iterator.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class RectF;
 class Vector2d;
 }
 
 namespace cc {
 
-class CC_EXPORT TilingData {
+class CC_BASE_EXPORT TilingData {
  public:
   TilingData();
   TilingData(const gfx::Size& max_texture_size,
              const gfx::Size& tiling_size,
              bool has_border_texels);
   TilingData(const gfx::Size& max_texture_size,
              const gfx::Size& tiling_size,
              int border_texels);
 
   gfx::Size tiling_size() const { return tiling_size_; }
@@ skipping 29 matching lines @@
   int TilePositionX(int x_index) const;
   int TilePositionY(int y_index) const;
   int TileSizeX(int x_index) const;
   int TileSizeY(int y_index) const;
 
   gfx::RectF TexelExtent(int i, int j) const;
 
   // Difference between TileBound's and TileBoundWithBorder's origin().
   gfx::Vector2d TextureOffset(int x_index, int y_index) const;
 
-  class CC_EXPORT BaseIterator {
+  class CC_BASE_EXPORT BaseIterator {
    public:
     operator bool() const { return index_x_ != -1 && index_y_ != -1; }
 
     int index_x() const { return index_x_; }
     int index_y() const { return index_y_; }
     std::pair<int, int> index() const {
      return std::make_pair(index_x_, index_y_);
     }
 
    protected:
     BaseIterator();
     void done() {
       index_x_ = -1;
       index_y_ = -1;
     }
 
     int index_x_;
     int index_y_;
   };
 
   // Iterate through tiles whose bounds + optional border intersect with |rect|.
-  class CC_EXPORT Iterator : public BaseIterator {
+  class CC_BASE_EXPORT Iterator : public BaseIterator {
    public:
     Iterator();
     Iterator(const TilingData* tiling_data,
              const gfx::Rect& consider_rect,
              bool include_borders);
     Iterator& operator++();
 
    private:
     IndexRect index_rect_;
   };
 
-  class CC_EXPORT BaseDifferenceIterator : public BaseIterator {
+  class CC_BASE_EXPORT BaseDifferenceIterator : public BaseIterator {
    protected:
     BaseDifferenceIterator();
     BaseDifferenceIterator(const TilingData* tiling_data,
                            const gfx::Rect& consider_rect,
                            const gfx::Rect& ignore_rect);
 
     bool HasConsiderRect() const;
 
     IndexRect consider_index_rect_;
     IndexRect ignore_index_rect_;
   };
 
   // Iterate through all indices whose bounds (not including borders) intersect
   // with |consider| but which also do not intersect with |ignore|.
-  class CC_EXPORT DifferenceIterator : public BaseDifferenceIterator {
+  class CC_BASE_EXPORT DifferenceIterator : public BaseDifferenceIterator {
    public:
     DifferenceIterator();
     DifferenceIterator(const TilingData* tiling_data,
                        const gfx::Rect& consider_rect,
                        const gfx::Rect& ignore_rect);
     DifferenceIterator& operator++();
   };
 
   // Iterate through all indices whose bounds + border intersect with
   // |consider| but which also do not intersect with |ignore|. The iterator
   // order is a counterclockwise spiral around the given center.
-  class CC_EXPORT SpiralDifferenceIterator : public BaseDifferenceIterator {
+  class CC_BASE_EXPORT SpiralDifferenceIterator
+      : public BaseDifferenceIterator {
    public:
     SpiralDifferenceIterator();
     SpiralDifferenceIterator(const TilingData* tiling_data,
                              const gfx::Rect& consider_rect,
                              const gfx::Rect& ignore_rect,
                              const gfx::Rect& center_rect);
     SpiralDifferenceIterator& operator++();
 
    private:
     SpiralIterator spiral_iterator_;
   };
 
-  class CC_EXPORT ReverseSpiralDifferenceIterator
+  class CC_BASE_EXPORT ReverseSpiralDifferenceIterator
       : public BaseDifferenceIterator {
    public:
     ReverseSpiralDifferenceIterator();
     ReverseSpiralDifferenceIterator(const TilingData* tiling_data,
                                     const gfx::Rect& consider_rect,
                                     const gfx::Rect& ignore_rect,
                                     const gfx::Rect& center_rect);
     ReverseSpiralDifferenceIterator& operator++();
 
    private:
@@ skipping 15 matching lines @@
   int border_texels_;
 
   // These are computed values.
   int num_tiles_x_;
   int num_tiles_y_;
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_TILING_DATA_H_