Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4129)

Unified Diff: cc/TreeSynchronizer.h

Issue 10985088: cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/TiledLayerChromium.cpp ('k') | cc/UnthrottledTextureUploader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/TreeSynchronizer.h
diff --git a/cc/TreeSynchronizer.h b/cc/TreeSynchronizer.h
index 06991ef5efa8f0c08d0c1d2a85a921c0a06655c2..b180dd0bffe29b0733c7a72f424fa19d57f7af12 100644
--- a/cc/TreeSynchronizer.h
+++ b/cc/TreeSynchronizer.h
@@ -5,8 +5,8 @@
#ifndef TreeSynchronizer_h
#define TreeSynchronizer_h
+#include "base/basictypes.h"
#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -17,7 +17,6 @@ class CCLayerTreeHostImpl;
class LayerChromium;
class TreeSynchronizer {
-WTF_MAKE_NONCOPYABLE(TreeSynchronizer);
public:
// Accepts a LayerChromium tree and returns a reference to a CCLayerImpl tree that duplicates the structure
// of the LayerChromium tree, reusing the CCLayerImpls in the tree provided by oldCCLayerImplRoot if possible.
@@ -34,6 +33,8 @@ private:
static void collectExistingCCLayerImplRecursive(OwnPtrCCLayerImplMap& oldLayers, PassOwnPtr<CCLayerImpl>);
static PassOwnPtr<CCLayerImpl> synchronizeTreeRecursive(RawPtrCCLayerImplMap& newLayers, OwnPtrCCLayerImplMap& oldLayers, LayerChromium*, CCLayerTreeHostImpl*);
static void updateScrollbarLayerPointersRecursive(const RawPtrCCLayerImplMap& newLayers, LayerChromium*);
+
+ DISALLOW_COPY_AND_ASSIGN(TreeSynchronizer);
};
} // namespace cc
« no previous file with comments | « cc/TiledLayerChromium.cpp ('k') | cc/UnthrottledTextureUploader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698