remove goto in Distance field path renderer

src/gpu/GrAADistanceFieldPathRenderer.cpp

Index: src/gpu/GrAADistanceFieldPathRenderer.cpp
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
index b11769c7c743a57cdfc88ecdabaced1f34635d4d..f2d618efcde2a3116ceef6364325a39213531139 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -150,6 +150,40 @@ bool GrAADistanceFieldPathRenderer::onDrawPath(GrDrawTarget* target,
 // padding around path bounds to allow for antialiased pixels
 const SkScalar kAntiAliasPad = 1.0f;
 
+inline bool GrAADistanceFieldPathRenderer::uploadPath(GrPlot** plot, SkIPoint16* atlasLocation,
+                                                      int width, int height, void* dfStorage) {
+    *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+
+    // if atlas full
+    if (NULL == *plot) {
+        if (this->freeUnusedPlot()) {
+            *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+            if (*plot) {
+                return true;
+            }
+        }
+
+        if (c_DumpPathCache) {
+#ifdef SK_DEVELOPER
+            GrTexture* texture = fAtlas->getTexture();
+            texture->surfacePriv().savePixels("pathcache.png");
+#endif
+        }
+
+        // before we purge the cache, we must flush any accumulated draws
+        fContext->flush();
+
+        if (this->freeUnusedPlot()) {
+            *plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage, atlasLocation);
+            if (*plot) {
+                return true;
+            }
+        }
+        return false;
+    }
+    return true;
+}
+
 GrAADistanceFieldPathRenderer::PathData* GrAADistanceFieldPathRenderer::addPathToAtlas(
                                                                         const SkPath& path,
                                                                         const SkStrokeRec& stroke,
@@ -209,42 +243,12 @@ GrAADistanceFieldPathRenderer::PathData* GrAADistanceFieldPathRenderer::addPathT
     helper.toSDF((unsigned char*) dfStorage.get());
     
     // add to atlas
+    GrPlot* plot;
     SkIPoint16  atlasLocation;
-    GrPlot* plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-    
-    // if atlas full
-    if (NULL == plot) {
-        if (this->freeUnusedPlot()) {
-            plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-            if (plot) {
-                goto HAS_ATLAS;
-            }
-        }
-    
-        if (c_DumpPathCache) {
-#ifdef SK_DEVELOPER
-            GrTexture* texture = fAtlas->getTexture();
-            texture->surfacePriv().savePixels("pathcache.png");
-#endif
-        }
-        
-        // before we purge the cache, we must flush any accumulated draws
-        fContext->flush();
-        
-        if (this->freeUnusedPlot()) {
-            plot = fAtlas->addToAtlas(&fPlotUsage, width, height, dfStorage.get(),
-                                      &atlasLocation);
-            if (plot) {
-                goto HAS_ATLAS;
-            }
-        }
-            
+    if (!this->uploadPath(&plot, &atlasLocation, width, height, dfStorage.get())) {

[jvanverth1, 2015/02/11 18:14:20]

I think this should be okay -- but I would test on Nexus 7 to make sure it's not
overoptimized (see the similar code in GrDistanceFieldTextContext).

         return NULL;
     }
-    
-HAS_ATLAS:
+
     // add to cache
     PathData* pathData = SkNEW(PathData);
     pathData->fKey.fGenID = path.getGenerationID();