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

Unified Diff: src/gpu/GrTemplates.h

Issue 23483042: Replace uses of GrNoncopyable by SkNoncopyable. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm GrNoncopyable.h Created 7 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 | « src/gpu/GrSWMaskHelper.h ('k') | src/gpu/effects/GrTextureStripAtlas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrTemplates.h
diff --git a/src/gpu/GrTemplates.h b/src/gpu/GrTemplates.h
index 69720dc111ac4b15087d35fd773eb6f3525485cd..5a009dfdf109fed9977d24d5b4a78d5419ab1766 100644
--- a/src/gpu/GrTemplates.h
+++ b/src/gpu/GrTemplates.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2010 Google Inc.
*
@@ -6,11 +5,10 @@
* found in the LICENSE file.
*/
-
#ifndef GrTemplates_DEFINED
#define GrTemplates_DEFINED
-#include "GrNoncopyable.h"
+#include "SkTypes.h"
/**
* Use to cast a ptr to a different type, and maintain strict-aliasing
@@ -37,7 +35,7 @@ template <typename Dst, typename Src> Dst GrTCast(Src src) {
* ...
* } // fCount is restored
*/
-template <typename T> class GrAutoTRestore : public GrNoncopyable {
+template <typename T> class GrAutoTRestore : public SkNoncopyable {
public:
GrAutoTRestore() : fPtr(NULL), fVal() {}
« no previous file with comments | « src/gpu/GrSWMaskHelper.h ('k') | src/gpu/effects/GrTextureStripAtlas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698