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

Unified Diff: include/gpu/GrContext.h

Issue 23904003: Remove GrRefCnt.h in favor of SkRefCnt.h (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm GrRefCnt.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 | « include/core/SkRefCnt.h ('k') | include/gpu/GrEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrContext.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index ae549b62a2237002e0240bb817b935c6268055a5..42413fb13cffe358bf731a50cf205d9ad6581e4c 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -15,7 +15,6 @@
#include "GrPathRendererChain.h"
#include "GrPoint.h"
#include "GrRenderTarget.h"
-#include "GrRefCnt.h"
#include "GrTexture.h"
class GrAARectRenderer;
@@ -40,7 +39,7 @@ class GrVertexBufferAllocPool;
class GrSoftwarePathRenderer;
class SkStrokeRec;
-class SK_API GrContext : public GrRefCnt {
+class SK_API GrContext : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(GrContext)
@@ -635,20 +634,20 @@ public:
public:
AutoRenderTarget(GrContext* context, GrRenderTarget* target) {
fPrevTarget = context->getRenderTarget();
- GrSafeRef(fPrevTarget);
+ SkSafeRef(fPrevTarget);
context->setRenderTarget(target);
fContext = context;
}
AutoRenderTarget(GrContext* context) {
fPrevTarget = context->getRenderTarget();
- GrSafeRef(fPrevTarget);
+ SkSafeRef(fPrevTarget);
fContext = context;
}
~AutoRenderTarget() {
if (NULL != fContext) {
fContext->setRenderTarget(fPrevTarget);
}
- GrSafeUnref(fPrevTarget);
+ SkSafeUnref(fPrevTarget);
}
private:
GrContext* fContext;
@@ -934,7 +933,7 @@ private:
*/
static bool OverbudgetCB(void* data);
- typedef GrRefCnt INHERITED;
+ typedef SkRefCnt INHERITED;
};
/**
« no previous file with comments | « include/core/SkRefCnt.h ('k') | include/gpu/GrEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698