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

cc/RenderSurfaceChromium.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 RenderSurfaceChromium_h
 #define RenderSurfaceChromium_h
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "base/basictypes.h"
 #include "FloatRect.h"
 #include "IntRect.h"
 #include <public/WebTransformationMatrix.h>
-#include <wtf/Noncopyable.h>
 
 namespace cc {
 
 class LayerChromium;
 
 class RenderSurfaceChromium {
-    WTF_MAKE_NONCOPYABLE(RenderSurfaceChromium);
 public:
     explicit RenderSurfaceChromium(LayerChromium*);
     ~RenderSurfaceChromium();
 
     // Returns the rect that encloses the RenderSurface including any reflection.
     FloatRect drawableContentRect() const;
 
     const IntRect& contentRect() const { return m_contentRect; }
     void setContentRect(const IntRect& contentRect) { m_contentRect = contentRect; }
 
@@ skipping 28 matching lines @@
     Vector<RefPtr<LayerChromium> >& layerList() { return m_layerList; }
     // A no-op since DelegatedRendererLayers on the main thread don't have any
     // RenderPasses so they can't contribute to a surface.
     void addContributingDelegatedRenderPassLayer(LayerChromium*) { }
     void clearLayerLists() { m_layerList.clear(); }
 
     void setNearestAncestorThatMovesPixels(RenderSurfaceChromium* surface) { m_nearestAncestorThatMovesPixels = surface; }
     const RenderSurfaceChromium* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; }
 
 private:
+    friend struct CCLayerIteratorActions;
+
     LayerChromium* m_owningLayer;
 
     // Uses this surface's space.
     IntRect m_contentRect;
 
     float m_drawOpacity;
     bool m_drawOpacityIsAnimating;
     WebKit::WebTransformationMatrix m_drawTransform;
     WebKit::WebTransformationMatrix m_screenSpaceTransform;
     WebKit::WebTransformationMatrix m_replicaDrawTransform;
     WebKit::WebTransformationMatrix m_replicaScreenSpaceTransform;
     bool m_targetSurfaceTransformsAreAnimating;
     bool m_screenSpaceTransformsAreAnimating;
 
     // Uses the space of the surface's target surface.
     IntRect m_clipRect;
 
     Vector<RefPtr<LayerChromium> > m_layerList;
 
     // The nearest ancestor target surface that will contain the contents of this surface, and that is going
     // to move pixels within the surface (such as with a blur). This can point to itself.
     RenderSurfaceChromium* m_nearestAncestorThatMovesPixels;
 
     // For CCLayerIteratorActions
     int m_targetRenderSurfaceLayerIndexHistory;
     int m_currentLayerIndexHistory;
-    friend struct CCLayerIteratorActions;
+
+    DISALLOW_COPY_AND_ASSIGN(RenderSurfaceChromium);
 };
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif