fix the error that path is inversed for stroke and strokeAndFill styles

src/gpu/GrContext.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrContext.h"
@@ skipping 1189 matching lines @@
     SkTLazy<SkPath> tmpPath;
     SkTCopyOnFirstWrite<SkStrokeRec> stroke(origStroke);
 
     // Try a 1st time without stroking the path and without allowing the SW renderer
     GrPathRenderer* pr = this->getPathRenderer(*pathPtr, *stroke, target, false, type);
 
     if (NULL == pr) {
         if (!GrPathRenderer::IsStrokeHairlineOrEquivalent(*stroke, this->getMatrix(), NULL)) {
             // It didn't work the 1st time, so try again with the stroked path
             if (stroke->applyToPath(tmpPath.init(), *pathPtr)) {
+                // make sure the path will not be inverse-stroked

[bsalomon, 2014/04/23 15:06:12]

Shouldn't applyToPath just return a path with the correct fill type?

We shouldn't need to look at stroke after calling applyToPath since applyToPath
should return a path that just needs to be filled.

[yunchao, 2014/04/24 16:12:43]

applyToPath doesn't change the style. For a stroke path, it will record the
inner contour and outer contour for filling the area between these two contours.
So it will inverse-stroke for stroke style and strokeAndFill style if we don't
exclude these styles here.

[bsalomon, 2014/04/24 17:33:21]

It *should* set the correct fill type.

+                if (SkStrokeRec::kFill_Style != stroke->getStyle() &&
+                    tmpPath.get()->isInverseFillType()) {
+                        tmpPath.get()->toggleInverseFillType();
+                }
                 pathPtr = tmpPath.get();
                 stroke.writable()->setFillStyle();
                 if (pathPtr->isEmpty()) {
                     return;
                 }
             }
         }
 
         // This time, allow SW renderer
         pr = this->getPathRenderer(*pathPtr, *stroke, target, true, type);
@@ skipping 604 matching lines @@
     }
     return path;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 #if GR_CACHE_STATS
 void GrContext::printCacheStats() const {
     fTextureCache->printStats();
 }
 #endif