fix the rendering error for drawPosText_asPaths

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 978 matching lines @@
     uint32_t flags = this->getFlags();
     // 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 = SK_Scalar1;
+
+    // path effect will affects the generation of path for text, don't change
+    // SkPaint if it exists. If no path effect, text drawing is based on 
+    // canonical text, so textSize and strokeWidth need to be reset. However,
+    // hairline stroked text is treated as filled to generate its path.
+    if (NULL == this->getPathEffect()) {
+        this->setTextSize(kCanonicalTextSizeForPaths);
+        scale = textSize / kCanonicalTextSizeForPaths;
+
+        if (this->getStrokeWidth() > 0 &&
+            SkPaint::kFill_Style != this->getStyle()) {
+            this->setStrokeWidth(SkScalarDiv(this->getStrokeWidth(), scale));
+        } else {
+            this->setStyle(SkPaint::kFill_Style);
+        }
+    }
+
+    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 1725 matching lines @@
     }
 #ifdef SK_BUILD_FOR_ANDROID
     if (dirty & kPaintOptionsAndroid_DirtyBit) {
         SkPaintOptionsAndroid options;
         options.unflatten(buffer);
         paint->setPaintOptionsAndroid(options);
     }
 #endif
     SkASSERT(dirty == paint->fDirtyBits);
 }