diff --git a/gyp/core.gyp b/gyp/core.gyp index 5cab78a7c..07e645650 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -133,6 +133,7 @@ '../src/core/SkSpriteBlitterTemplate.h', '../src/core/SkStream.cpp', '../src/core/SkString.cpp', + '../src/core/SkStroke.h', '../src/core/SkStroke.cpp', '../src/core/SkStrokerPriv.cpp', '../src/core/SkStrokerPriv.h', @@ -213,7 +214,6 @@ '../include/core/SkShader.h', '../include/core/SkStream.h', '../include/core/SkString.h', - '../include/core/SkStroke.h', '../include/core/SkTArray.h', '../include/core/SkTDArray.h', '../include/core/SkTDStack.h', diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp index 4b486b1da..31c36bafe 100644 --- a/src/core/SkStroke.cpp +++ b/src/core/SkStroke.cpp @@ -653,12 +653,3 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const { } } -void SkStroke::strokeLine(const SkPoint& p0, const SkPoint& p1, - SkPath* dst) const { - SkPath tmp; - - tmp.moveTo(p0); - tmp.lineTo(p1); - this->strokePath(tmp, dst); -} - diff --git a/include/core/SkStroke.h b/src/core/SkStroke.h similarity index 83% rename from include/core/SkStroke.h rename to src/core/SkStroke.h index e5d69c4a1..46e6ba140 100644 --- a/include/core/SkStroke.h +++ b/src/core/SkStroke.h @@ -40,10 +40,6 @@ public: bool getDoFill() const { return SkToBool(fDoFill); } void setDoFill(bool doFill) { fDoFill = SkToU8(doFill); } - void strokeLine(const SkPoint& start, const SkPoint& end, SkPath*) const; - void strokeRect(const SkRect& rect, SkPath*) const; - void strokeOval(const SkRect& oval, SkPath*) const; - void strokeRRect(const SkRect& rect, SkScalar rx, SkScalar ry, SkPath*) const; void strokePath(const SkPath& path, SkPath*) const; ////////////////////////////////////////////////////////////////