From bcd7ab5c0d0e5c3432a9aaeb44f1b703fea94282 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 18 Jun 2015 05:27:18 -0700 Subject: Add useDFT field to SkDeviceProperties Review URL: https://codereview.chromium.org/1191943002 --- include/gpu/GrContext.h | 7 +++---- include/gpu/GrDrawContext.h | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 31cb4d0eb1..a98cf0bf91 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -177,12 +177,11 @@ public: * NULL will be returned if the context has been abandoned. * * @param devProps the device properties (mainly defines text drawing) - * @param uesDFT should Distance Field Text be used? * * @return a draw context */ - GrDrawContext* drawContext(const SkDeviceProperties* devProps = NULL, bool useDFT = false) { - return fDrawingMgr.drawContext(devProps, useDFT); + GrDrawContext* drawContext(const SkDeviceProperties* devProps = NULL) { + return fDrawingMgr.drawContext(devProps); } /////////////////////////////////////////////////////////////////////////// @@ -420,7 +419,7 @@ private: // Callers should take a ref if they rely on the GrDrawContext sticking around. // NULL will be returned if the context has been abandoned. - GrDrawContext* drawContext(const SkDeviceProperties* devProps, bool useDFT); + GrDrawContext* drawContext(const SkDeviceProperties* devProps); private: void cleanup(); diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 7e711260ce..1688694133 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -244,14 +244,14 @@ private: friend class GrAtlasTextContext; // for access to drawBatch friend class GrContext; // for ctor - GrDrawContext(GrContext*, GrDrawTarget*, const SkDeviceProperties&, bool useDFT); + GrDrawContext(GrContext*, GrDrawTarget*, const SkDeviceProperties&); // Sets the paint. Returns true on success; false on failure. bool prepareToDraw(GrPipelineBuilder*, GrRenderTarget* rt, const GrClip&, const GrPaint* paint); - GrTextContext* createTextContext(GrRenderTarget*, const SkDeviceProperties&, bool useDFT); + GrTextContext* createTextContext(GrRenderTarget*, const SkDeviceProperties&); // A simpler version of the above which just returns true on success; false on failure. // Clip is *NOT* set @@ -274,7 +274,6 @@ private: GrTextContext* fTextContext; // lazily created SkDeviceProperties* fDevProps; // ptr b.c. SkDeviceProperties isn't public - bool fUseDFT; }; #endif -- cgit v1.2.3