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

Unified Diff: cc/CCFontAtlas.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/CCDirectRenderer.h ('k') | cc/CCFrameRateCounter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCFontAtlas.h
diff --git a/cc/CCFontAtlas.h b/cc/CCFontAtlas.h
index 32538091a68729d035dc993a9eefbce341e5557e..fae5a056764ff7cbbe14c2d99fd2dbdaf5a5c371 100644
--- a/cc/CCFontAtlas.h
+++ b/cc/CCFontAtlas.h
@@ -7,6 +7,7 @@
#if USE(ACCELERATED_COMPOSITING)
+#include "base/basictypes.h"
#include "IntRect.h"
#include "SkBitmap.h"
#include <string>
@@ -25,7 +26,6 @@ class IntSize;
// This class provides basic ability to draw text onto the heads-up display.
class CCFontAtlas {
- WTF_MAKE_NONCOPYABLE(CCFontAtlas);
public:
static PassOwnPtr<CCFontAtlas> create(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight)
{
@@ -56,6 +56,8 @@ private:
IntRect m_asciiToRectTable[128];
int m_fontHeight;
+
+ DISALLOW_COPY_AND_ASSIGN(CCFontAtlas);
};
} // namespace cc
« no previous file with comments | « cc/CCDirectRenderer.h ('k') | cc/CCFrameRateCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698