Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrDefaultPathRenderer.cpp

diff --git a/src/third_party/skia/src/gpu/GrDefaultPathRenderer.cpp b/src/third_party/skia/src/gpu/GrDefaultPathRenderer.cpp
index 01e1a94..dd6ae9d 100644 (file)
--- a/src/third_party/skia/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/third_party/skia/src/gpu/GrDefaultPathRenderer.cpp
@@ -491,7 +491,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
                 bounds = path.getBounds();
             }
             GrDrawTarget::AutoGeometryAndStatePush agasp(target, GrDrawTarget::kPreserve_ASRInit);
-            target->drawSimpleRect(bounds, NULL);
+            target->drawSimpleRect(bounds);
         } else {
             if (passCount > 1) {
                 drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
@@ -513,7 +513,7 @@ bool GrDefaultPathRenderer::canDrawPath(const SkPath& path,
                                         bool antiAlias) const {
     // this class can draw any path with any fill but doesn't do any anti-aliasing.
 
-    return !antiAlias &&
+    return !antiAlias && !(SkPath::kConic_SegmentMask & path.getSegmentMasks()) &&
         (stroke.isFillStyle() ||
          IsStrokeHairlineOrEquivalent(stroke, target->getDrawState().getViewMatrix(), NULL));
 }