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

Unified Diff: cc/RenderSurfaceChromium.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/ContentLayerChromium.h ('k') | cc/ScrollbarLayerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/RenderSurfaceChromium.h
diff --git a/cc/RenderSurfaceChromium.h b/cc/RenderSurfaceChromium.h
index e9fa52203e5ed537f3d358c6f16916b068b6d18c..f267671c3901852368232b79d7d19ad45f4a36b3 100644
--- a/cc/RenderSurfaceChromium.h
+++ b/cc/RenderSurfaceChromium.h
@@ -8,17 +8,16 @@
#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();
@@ -67,6 +66,8 @@ public:
const RenderSurfaceChromium* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; }
private:
+ friend struct CCLayerIteratorActions;
+
LayerChromium* m_owningLayer;
// Uses this surface's space.
@@ -93,7 +94,8 @@ private:
// For CCLayerIteratorActions
int m_targetRenderSurfaceLayerIndexHistory;
int m_currentLayerIndexHistory;
- friend struct CCLayerIteratorActions;
+
+ DISALLOW_COPY_AND_ASSIGN(RenderSurfaceChromium);
};
}
« no previous file with comments | « cc/ContentLayerChromium.h ('k') | cc/ScrollbarLayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698