Fix several issues with drawing text as paths.

src/core/SkPaint.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPaint.h"
 #include "SkAnnotation.h"
@@ skipping 968 matching lines @@
     // clear the flags we don't care about
     flags &= ~TEXT_AS_PATHS_PAINT_FLAGS_TO_IGNORE;
     // set the flags we do care about
     flags |= SkPaint::kSubpixelText_Flag;
 
     this->setFlags(flags);
     this->setHinting(SkPaint::kNo_Hinting);
 
     SkScalar textSize = fTextSize;
     this->setTextSize(kCanonicalTextSizeForPaths);
-    return textSize / kCanonicalTextSizeForPaths;
+    SkScalar scale = textSize / kCanonicalTextSizeForPaths;
+    this->setStrokeWidth(fWidth / scale);

[reed1, 2013/07/29 14:44:39]

Can this be: setStrokeWIdth(fWidth * kCanonical / textSize) and avoid the 2nd
divide?

[bungeman-skia, 2013/07/29 14:54:18]

Sure, so long as its the same number, doesn't matter how we get there.

+    //this->setStrokeMiter(fMiterLimit / scale);

[reed1, 2013/07/29 14:44:39]

Do we need this line?

[bungeman-skia, 2013/07/29 14:54:18]

Probably? The only reason it's commented out is that this creates crazy
artifacts in the shadertext2 gm. (The points on the 'A' get pointy.)

[bungeman-skia, 2014/05/22 15:06:25]

Mike pointed out to me that the miter limit is actually a ratio anyway, not a
hard value. As a result, this commented out line should be removed as it does
not need to scale.

+    return scale;
 }
 
 class SkCanonicalizePaint {
 public:
     SkCanonicalizePaint(const SkPaint& paint) : fPaint(&paint), fScale(0) {
         if (paint.isLinearText() || paint.tooBigToUseCache()) {
             SkPaint* p = fLazy.set(paint);
             fScale = p->setupForAsPaths();
             fPaint = p;
         }
@@ skipping 1494 matching lines @@
             paint.getStyle() != SkPaint::kFill_Style;
 }
 
 SkTextToPathIter::SkTextToPathIter( const char text[], size_t length,
                                     const SkPaint& paint,
                                     bool applyStrokeAndPathEffects)
                                     : fPaint(paint) {
     fGlyphCacheProc = paint.getMeasureCacheProc(SkPaint::kForward_TextBufferDirection,
                                                 true);
 
-    fPaint.setLinearText(true);
     fPaint.setMaskFilter(NULL);   // don't want this affecting our path-cache lookup
 
     if (fPaint.getPathEffect() == NULL && !has_thick_frame(fPaint)) {
         applyStrokeAndPathEffects = false;
     }
 
     // can't use our canonical size if we need to apply patheffects
-    if (fPaint.getPathEffect() == NULL) {
+    if (fPaint.isLinearText() && fPaint.getPathEffect() == NULL) {
         fPaint.setTextSize(SkIntToScalar(SkPaint::kCanonicalTextSizeForPaths));
         fScale = paint.getTextSize() / SkPaint::kCanonicalTextSizeForPaths;
         if (has_thick_frame(fPaint)) {
             fPaint.setStrokeWidth(SkScalarDiv(fPaint.getStrokeWidth(), fScale));
         }
     } else {
         fScale = SK_Scalar1;
     }
 
     if (!applyStrokeAndPathEffects) {
@@ skipping 79 matching lines @@
             case SkXfermode::kPlus_Mode:
                 return 0 == this->getAlpha();
             case SkXfermode::kDst_Mode:
                 return true;
             default:
                 break;
         }
     }
     return false;
 }