Move surface props off of GrTextContext

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"
@@ skipping 13 matching lines @@
         // after a cleanup
         fDrawTargets[i]->reset();
         fDrawTargets[i]->unref();
     }
 
     fDrawTargets.reset();
 
     delete fNVPRTextContext;
     fNVPRTextContext = nullptr;
 
-    for (int i = 0; i < kNumPixelGeometries; ++i) {
-        delete fTextContexts[i][0];
-        fTextContexts[i][0] = nullptr;
-        delete fTextContexts[i][1];
-        fTextContexts[i][1] = nullptr;
-    }
+    delete fAtlasTextContext;
+    fAtlasTextContext = nullptr;
 
     delete fPathRendererChain;
     fPathRendererChain = nullptr;
     SkSafeSetNull(fSoftwarePathRenderer);
 }
 
 GrDrawingManager::~GrDrawingManager() {
     this->cleanup();
 }
 
@@ skipping 61 matching lines @@
         fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
     }
 #else
     fDrawTargets.reset();
 #endif
 
     fFlushState.reset();
     fFlushing = false;
 }
 
-GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props,
-                                             GrRenderTarget* rt) {
+GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props, GrRenderTarget* rt) {
     if (this->abandoned()) {
         return nullptr;
     }
 
-    SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
     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(fContext, props);
+                fNVPRTextContext = GrStencilAndCoverTextContext::Create(fContext);
             }
 
             return fNVPRTextContext;
         }
     }
 
-    if (!fTextContexts[props.pixelGeometry()][useDIF]) {
-        fTextContexts[props.pixelGeometry()][useDIF] = GrAtlasTextContext::Create(fContext, props);
+    if (!fAtlasTextContext) {
+        fAtlasTextContext = GrAtlasTextContext::Create(fContext);
     }
 
-    return fTextContexts[props.pixelGeometry()][useDIF];
+    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.
@@ skipping 40 matching lines @@
 }
 
 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
                                              const SkSurfaceProps* surfaceProps) {
     if (this->abandoned()) {
         return nullptr;
     }
 
     return new GrDrawContext(this, rt, surfaceProps, fContext->getAuditTrail(), fSingleOwner);
 }