Create GrPathRenderingDrawContext

src/gpu/GrDrawingManager.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrDrawTarget.h"
+#include "GrPathRenderingDrawContext.h"
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
 #include "SkTTopoSort.h"
 
 #include "text/GrAtlasTextContext.h"
 #include "text/GrStencilAndCoverTextContext.h"
 
 void GrDrawingManager::cleanup() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->makeClosed();  // no drawTarget should receive a new command after this
         fDrawTargets[i]->clearRT();
 
         // We shouldn't need to do this, but it turns out some clients still hold onto drawtargets
         // after a cleanup
         fDrawTargets[i]->reset();
         fDrawTargets[i]->unref();
     }
 
     fDrawTargets.reset();
 
-    delete fNVPRTextContext;
-    fNVPRTextContext = nullptr;
-
-    delete fAtlasTextContext;
-    fAtlasTextContext = nullptr;
-
     delete fPathRendererChain;
     fPathRendererChain = nullptr;
     SkSafeSetNull(fSoftwarePathRenderer);
 }
 
 GrDrawingManager::~GrDrawingManager() {
     this->cleanup();
 }
 
 void GrDrawingManager::abandon() {
@@ skipping 60 matching lines @@
         fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
     }
 #else
     fDrawTargets.reset();
 #endif
 
     fFlushState.reset();
     fFlushing = false;
 }
 
-GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props, GrRenderTarget* rt) {
-    if (this->abandoned()) {
-        return nullptr;
-    }
-
-    bool useDIF = props.isUseDeviceIndependentFonts();
-
-    if (useDIF && fContext->caps()->shaderCaps()->pathRenderingSupport() &&
-        rt->isStencilBufferMultisampled()) {
-        GrStencilAttachment* sb = fContext->resourceProvider()->attachStencilAttachment(rt);
-        if (sb) {
-            if (!fNVPRTextContext) {
-                fNVPRTextContext = GrStencilAndCoverTextContext::Create();
-            }
-
-            return fNVPRTextContext;
-        }
-    }
-
-    if (!fAtlasTextContext) {
-        fAtlasTextContext = GrAtlasTextContext::Create();
-    }
-
-    return fAtlasTextContext;
-}
-
 GrDrawTarget* GrDrawingManager::newDrawTarget(GrRenderTarget* rt) {
     SkASSERT(fContext);
 
 #ifndef ENABLE_MDB
     // When MDB is disabled we always just return the single drawTarget
     if (fDrawTargets.count()) {
         SkASSERT(fDrawTargets.count() == 1);
         // In the non-MDB-world the same drawTarget gets reused for multiple render targets.
         // Update this pointer so all the asserts are happy
         rt->setLastDrawTarget(fDrawTargets[0]);
@@ skipping 36 matching lines @@
 
     return pr;
 }
 
 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
                                              const SkSurfaceProps* surfaceProps) {
     if (this->abandoned()) {
         return nullptr;
     }
 
+
+    bool useDIF = false;
+    if (surfaceProps) {
+        useDIF = surfaceProps->isUseDeviceIndependentFonts();
+    }
+
+    if (useDIF && fContext->caps()->shaderCaps()->pathRenderingSupport() &&
+        rt->isStencilBufferMultisampled()) {
+        GrStencilAttachment* sb = fContext->resourceProvider()->attachStencilAttachment(rt);
+        if (sb) {
+            return new GrPathRenderingDrawContext(fContext, this, rt, surfaceProps,
+                                                  fContext->getAuditTrail(), fSingleOwner);
+        }
+    }
+
     return new GrDrawContext(fContext, this, rt, surfaceProps, fContext->getAuditTrail(),
                              fSingleOwner);
 }