simplify option flow
The GrTextContext::options would flow from the GrRecordingContext to
the GrDrawingManager to the GrTextContext, and finally to the
GrRenderTargetContext.
Just find them on the GrRecording context off the GrRenderTargetContext.
Change-Id: I902481d20072c2470905261ab81c2b6456f25343
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295559
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index f74e860..046c1c0 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -167,19 +167,15 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
GrDrawingManager::GrDrawingManager(GrRecordingContext* context,
const GrPathRendererChain::Options& optionsForPathRendererChain,
- const GrTextContext::Options& optionsForTextContext,
bool sortRenderTasks,
bool reduceOpsTaskSplitting)
: fContext(context)
, fOptionsForPathRendererChain(optionsForPathRendererChain)
- , fOptionsForTextContext(optionsForTextContext)
, fDAG(sortRenderTasks)
- , fTextContext(nullptr)
, fPathRendererChain(nullptr)
, fSoftwarePathRenderer(nullptr)
, fFlushing(false)
- , fReduceOpsTaskSplitting(reduceOpsTaskSplitting) {
-}
+ , fReduceOpsTaskSplitting(reduceOpsTaskSplitting) { }
void GrDrawingManager::cleanup() {
fDAG.cleanup(this, fContext->priv().caps());
@@ -929,14 +925,6 @@
return true;
}
-GrTextContext* GrDrawingManager::getTextContext() {
- if (!fTextContext) {
- fTextContext = GrTextContext::Make(fOptionsForTextContext);
- }
-
- return fTextContext.get();
-}
-
/*
* This method finds a path renderer that can draw the specified path on
* the provided target.