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

cc/ScrollbarLayerChromium.cpp

 // 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.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "ScrollbarLayerChromium.h"
 
+#include "base/basictypes.h"
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCLayerTreeHost.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCTextureUpdateQueue.h"
 #include "LayerPainterChromium.h"
 #include <public/WebRect.h>
 
 using WebKit::WebRect;
 
 namespace cc {
@@ skipping 47 matching lines @@
     else
         scrollbarLayer->setThumbResourceId(0);
 }
 
 ScrollbarLayerChromium* ScrollbarLayerChromium::toScrollbarLayerChromium()
 {
     return this;
 }
 
 class ScrollbarBackgroundPainter : public LayerPainterChromium {
-    WTF_MAKE_NONCOPYABLE(ScrollbarBackgroundPainter);
 public:
     static PassOwnPtr<ScrollbarBackgroundPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart)
     {
         return adoptPtr(new ScrollbarBackgroundPainter(scrollbar, painter, geometry, trackPart));
     }
 
     virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect&) OVERRIDE
     {
         WebKit::WebCanvas* canvas = skCanvas;
         // The following is a simplification of ScrollbarThemeComposite::paint.
@@ skipping 33 matching lines @@
         , m_painter(painter)
         , m_geometry(geometry)
         , m_trackPart(trackPart)
     {
     }
 
     WebKit::WebScrollbar* m_scrollbar;
     WebKit::WebScrollbarThemePainter m_painter;
     WebKit::WebScrollbarThemeGeometry* m_geometry;
     WebKit::WebScrollbar::ScrollbarPart m_trackPart;
+
+    DISALLOW_COPY_AND_ASSIGN(ScrollbarBackgroundPainter);
 };
 
 bool ScrollbarLayerChromium::needsContentsScale() const
 {
     return true;
 }
 
 IntSize ScrollbarLayerChromium::contentBounds() const
 {
     return IntSize(lroundf(bounds().width() * contentsScale()), lroundf(bounds().height() * contentsScale()));
 }
 
 class ScrollbarThumbPainter : public LayerPainterChromium {
-    WTF_MAKE_NONCOPYABLE(ScrollbarThumbPainter);
 public:
     static PassOwnPtr<ScrollbarThumbPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
     {
         return adoptPtr(new ScrollbarThumbPainter(scrollbar, painter, geometry));
     }
 
     virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect& opaque) OVERRIDE
     {
         WebKit::WebCanvas* canvas = skCanvas;
 
         // Consider the thumb to be at the origin when painting.
         WebRect thumbRect = m_geometry->thumbRect(m_scrollbar);
         thumbRect.x = 0;
         thumbRect.y = 0;
         m_painter.paintThumb(canvas, thumbRect);
     }
 
 private:
     ScrollbarThumbPainter(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
         : m_scrollbar(scrollbar)
         , m_painter(painter)
         , m_geometry(geometry)
     {
     }
 
     WebKit::WebScrollbar* m_scrollbar;
     WebKit::WebScrollbarThemePainter m_painter;
     WebKit::WebScrollbarThemeGeometry* m_geometry;
+
+    DISALLOW_COPY_AND_ASSIGN(ScrollbarThumbPainter);
 };
 
 void ScrollbarLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
 {
     if (!host || host != layerTreeHost()) {
         m_backTrackUpdater.clear();
         m_backTrack.clear();
         m_thumbUpdater.clear();
         m_thumb.clear();
     }
@@ skipping 89 matching lines @@
 
     // Consider the thumb to be at the origin when painting.
     WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
     IntRect originThumbRect = layerRectToContentRect(WebKit::WebRect(0, 0, thumbRect.width, thumbRect.height));
     if (!originThumbRect.isEmpty())
         updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)