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

cc/CCResourceProvider.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 CCResourceProvider_h
 #define CCResourceProvider_h
 
+#include "base/basictypes.h"
 #include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "TextureCopier.h"
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
 namespace cc {
 
 class IntRect;
 class LayerTextureSubImage;
 class TextureCopier;
 class TextureUploader;
 
 // Thread-safety notes: this class is not thread-safe and can only be called
 // from the thread it was created on (in practice, the compositor thread).
 class CCResourceProvider {
-    WTF_MAKE_NONCOPYABLE(CCResourceProvider);
 public:
     typedef unsigned ResourceId;
     typedef Vector<ResourceId> ResourceIdArray;
     typedef HashMap<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
     struct Mailbox {
@@ skipping 104 matching lines @@
     static void debugNotifyContextLost();
     static void debugIncrementCommitCount();
     static void debugNotifyPtmClearAllMemoryCount();
     static void debugNotifyPtmReduceMemoryOnImplThread();
 
     // The following lock classes are part of the CCResourceProvider API and are
     // needed to read and write the resource contents. The user must ensure
     // that they only use GL locks on GL resources, etc, and this is enforced
     // by assertions.
     class ScopedReadLockGL {
-        WTF_MAKE_NONCOPYABLE(ScopedReadLockGL);
     public:
         ScopedReadLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedReadLockGL();
 
         unsigned textureId() const { return m_textureId; }
 
     private:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         unsigned m_textureId;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGL);
     };
 
     class ScopedWriteLockGL {
-        WTF_MAKE_NONCOPYABLE(ScopedWriteLockGL);
     public:
         ScopedWriteLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedWriteLockGL();
 
         unsigned textureId() const { return m_textureId; }
 
     private:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         unsigned m_textureId;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGL);
     };
 
     class ScopedReadLockSoftware {
-        WTF_MAKE_NONCOPYABLE(ScopedReadLockSoftware);
     public:
         ScopedReadLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedReadLockSoftware();
 
         const SkBitmap* skBitmap() const { return &m_skBitmap; }
 
     private:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedReadLockSoftware);
     };
 
     class ScopedWriteLockSoftware {
-        WTF_MAKE_NONCOPYABLE(ScopedWriteLockSoftware);
     public:
         ScopedWriteLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedWriteLockSoftware();
 
         SkCanvas* skCanvas() { return m_skCanvas.get(); }
 
     private:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
         OwnPtr<SkCanvas> m_skCanvas;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
     };
 
 private:
     struct Resource {
         Resource();
         Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format);
         Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format);
 
         unsigned glId;
         uint8_t* pixels;
@@ skipping 50 matching lines @@
     // Do not use these!
     static int64 m_commitCount;
     static int64 m_commitCountAtLastEviction;
     static int64 m_commitCountAtLastContextLost;
     static int64 m_evictionCount;
     static int64 m_contextLostCount;
     static int64 m_commitCountAtLastPtmClearAllMemoryCount;
     static int64 m_commitCountAtLastPtmReduceMemoryOnImplThread;
     static int64 m_resourceProviderCreatedCount;
     static int64 m_resourceProviderDestroyedCount;
+
+    DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
 };
 
 }
 
 #endif