commit ec87dc64dd40c1a4f80088023c94764caca79bf9
author bsalomon <bsalomon@google.com> Tue Oct 14 10:52:00 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 14 10:52:00 2014 -0700
tree 2201a1ae32f8ee33f3696018faca03ca514e7500
parent 585a5fc243e290ad9055ae1439a5e505d1ce7368

Flush text contexts before drawing text as path

BUG=416289

Review URL: https://codereview.chromium.org/636233008

src/gpu/GrBitmapTextContext.cpp

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 8620e97..fa70d32 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -407,6 +407,9 @@
             glyph->fPath = path;
         }
 
+        // flush any accumulated draws before drawing this glyph as a path.
+        this->flush();
+
         GrContext::AutoMatrix am;
         SkMatrix translate;
         translate.setTranslate(SkFixedToScalar(vx - SkIntToFixed(glyph->fBounds.fLeft)),

src/gpu/GrDistanceFieldTextContext.cpp

diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index e10fa4f..9fa0c1d 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -487,6 +487,9 @@
             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);