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

Unified Diff: include/gpu/GrPaint.h

Issue 1323963003: Make GrProcessorDataManager a noop (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | include/gpu/GrProcessorDataManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrPaint.h
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index f8aaa0e04c915ba3b68c2db3b6f2b2686695394c..51a49210c6a7547f9ce16273e9ab314a359d180e 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -136,7 +136,6 @@ public:
}
fXPFactory.reset(SkRef(paint.getXPFactory()));
- fProcDataManager.reset(new GrProcessorDataManager(*paint.processorDataManager()));
return *this;
}
@@ -149,9 +148,9 @@ public:
*/
bool isConstantBlendedColor(GrColor* constantColor) const;
- GrProcessorDataManager* getProcessorDataManager() { return fProcDataManager.get(); }
+ GrProcessorDataManager* getProcessorDataManager() { return &fProcDataManager; }
- const GrProcessorDataManager* processorDataManager() const { return fProcDataManager.get(); }
+ const GrProcessorDataManager* processorDataManager() const { return &fProcDataManager; }
private:
void resetFragmentProcessors() {
@@ -173,7 +172,7 @@ private:
bool fDither;
GrColor fColor;
- SkAutoTUnref<GrProcessorDataManager> fProcDataManager;
+ GrProcessorDataManager fProcDataManager;
};
#endif
« no previous file with comments | « no previous file | include/gpu/GrProcessorDataManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698