From 58b8d4a7a861604474f77875e0236da271cac81c Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 3 May 2012 14:02:17 +0000 Subject: [PATCH] recreate http://codereview.appspot.com/6131051/ in svn instead of git Review URL: https://codereview.appspot.com/6181044 git-svn-id: http://skia.googlecode.com/svn/trunk@3829 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/core.gyp | 2 +- src/core/SkStroke.cpp | 9 --------- {include => src}/core/SkStroke.h | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) rename {include => src}/core/SkStroke.h (83%) diff --git a/gyp/core.gyp b/gyp/core.gyp index 5cab78a7cc..07e6456505 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 4b486b1da4..31c36bafee 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 e5d69c4a18..46e6ba1401 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; ////////////////////////////////////////////////////////////////