cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library.

cc/CCLayerTilingData.h

 // Copyright 2011 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 CCLayerTilingData_h
 #define CCLayerTilingData_h
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "base/basictypes.h"
 #include "IntRect.h"
 #include "Region.h"
 #include "TilingData.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
 #include <wtf/PassOwnPtr.h>
 
 namespace cc {
 
 class CCLayerTilingData {
@@ skipping 15 matching lines @@
     IntSize tileSize() const;
     // Change the border texel setting. This may invalidate all existing tiles.
     void setBorderTexelOption(BorderTexelOption);
     bool hasBorderTexels() const { return m_tilingData.borderTexels(); }
 
     bool isEmpty() const { return hasEmptyBounds() || !tiles().size(); }
 
     const CCLayerTilingData& operator=(const CCLayerTilingData&);
 
     class Tile {
-        WTF_MAKE_NONCOPYABLE(Tile);
     public:
         Tile() : m_i(-1), m_j(-1) { }
         virtual ~Tile() { }
 
         int i() const { return m_i; }
         int j() const { return m_j; }
         void moveTo(int i, int j) { m_i = i; m_j = j; }
 
         const IntRect& opaqueRect() const { return m_opaqueRect; }
         void setOpaqueRect(const IntRect& opaqueRect) { m_opaqueRect = opaqueRect; }
     private:
         int m_i;
         int m_j;
         IntRect m_opaqueRect;
+        DISALLOW_COPY_AND_ASSIGN(Tile);
     };
     // Default hash key traits for integers disallow 0 and -1 as a key, so
     // use a custom hash trait which disallows -1 and -2 instead.
     typedef std::pair<int, int> TileMapKey;
     struct TileMapKeyTraits : HashTraits<TileMapKey> {
         static const bool emptyValueIsZero = false;
         static const bool needsDestruction = false;
         static TileMapKey emptyValue() { return std::make_pair(-1, -1); }
         static void constructDeletedValue(TileMapKey& slot) { slot = std::make_pair(-2, -2); }
         static bool isDeletedValue(TileMapKey value) { return value.first == -2 && value.second == -2; }
@@ skipping 20 matching lines @@
 
     TileMap m_tiles;
     TilingData m_tilingData;
 };
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif