Fix overoptimization in distance field code on N7 and N10.

src/gpu/GrDistanceFieldTextContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDistanceFieldTextContext.h"
 #include "GrAtlas.h"
 #include "GrBitmapTextContext.h"
@@ skipping 501 matching lines @@
     const SkMatrix& ctm = fContext->getMatrix();
     (void) ctm.mapRect(&dstRect, glyphRect);
     if (fClipRect.quickReject(SkScalarTruncToInt(dstRect.left()),
                               SkScalarTruncToInt(dstRect.top()),
                               SkScalarTruncToInt(dstRect.right()),
                               SkScalarTruncToInt(dstRect.bottom()))) {
 //            SkCLZ(3);    // so we can set a break-point in the debugger
         return true;
     }
 
-    if (NULL == glyph->fPlot && !uploadGlyph(glyph, scaler)) {
-        if (NULL == glyph->fPath) {
-            SkPath* path = SkNEW(SkPath);
-            if (!scaler->getGlyphPath(glyph->glyphID(), path)) {
-                // flag the glyph as being dead?
-                delete path;
-                return true;
+    if (NULL == glyph->fPlot) {
+        // needs to be a separate conditional to avoid over-optimization
+        // on Nexus 7 and Nexus 10
+        if (!uploadGlyph(glyph, scaler)) {
+            if (NULL == glyph->fPath) {
+                SkPath* path = SkNEW(SkPath);
+                if (!scaler->getGlyphPath(glyph->glyphID(), path)) {
+                    // flag the glyph as being dead?
+                    delete path;
+                    return true;
+                }
+                glyph->fPath = path;
             }
-            glyph->fPath = path;
+
+            // flush any accumulated draws before drawing this glyph as a path.
+            this->flush();
+
+            GrContext::AutoMatrix am;
+            SkMatrix ctm;
+            ctm.setScale(fTextRatio, fTextRatio);
+            ctm.postTranslate(sx - dx, sy - dy);
+            GrPaint tmpPaint(fPaint);
+            am.setPreConcat(fContext, ctm, &tmpPaint);
+            GrStrokeInfo strokeInfo(SkStrokeRec::kFill_InitStyle);
+            fContext->drawPath(tmpPaint, *glyph->fPath, strokeInfo);
+
+            // remove this glyph from the vertices we need to allocate
+            fTotalVertexCount -= kVerticesPerGlyph;
+            return true;
         }
-
-        // flush any accumulated draws before drawing this glyph as a path.
-        this->flush();
-
-        GrContext::AutoMatrix am;
-        SkMatrix ctm;
-        ctm.setScale(fTextRatio, fTextRatio);
-        ctm.postTranslate(sx - dx, sy - dy);
-        GrPaint tmpPaint(fPaint);
-        am.setPreConcat(fContext, ctm, &tmpPaint);
-        GrStrokeInfo strokeInfo(SkStrokeRec::kFill_InitStyle);
-        fContext->drawPath(tmpPaint, *glyph->fPath, strokeInfo);
-
-        // remove this glyph from the vertices we need to allocate
-        fTotalVertexCount -= kVerticesPerGlyph;
-        return true;
     }
 
     SkASSERT(glyph->fPlot);
     GrDrawTarget::DrawToken drawToken = fDrawTarget->getCurrentDrawToken();
     glyph->fPlot->setDrawToken(drawToken);
 
     GrTexture* texture = glyph->fPlot->texture();
     SkASSERT(texture);
 
     if (fCurrTexture != texture || fCurrVertex + kVerticesPerGlyph > fTotalVertexCount) {
@@ skipping 120 matching lines @@
     }
 }
 
 inline void GrDistanceFieldTextContext::finish() {
     this->flush();
     fTotalVertexCount = 0;
 
     GrTextContext::finish();
 }