diff options
author | Mike Reed <reed@google.com> | 2017-03-04 19:42:31 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-04 19:42:39 +0000 |
commit | 12da890fbdafb2a2e33ced24e207ffc8cdec54c7 (patch) | |
tree | 56cc2ae886ef068ff0ebb13a22c9357b40cdc6dd /src/core/SkPathEffect.cpp | |
parent | 7067fc6224833941380729857ad865547bc88430 (diff) |
Revert "move some of patheffect internals into private"
This reverts commit 7067fc6224833941380729857ad865547bc88430.
Reason for revert: need to update android jni
Original change's description:
> move some of patheffect internals into private
>
> BUG=skia:
>
> Change-Id: I00da9d38f16fb20f31e025dd817c5d430466a1d0
> Reviewed-on: https://skia-review.googlesource.com/9236
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I3a67b5aa9660742ec73563972b57d66c205dc0d5
Reviewed-on: https://skia-review.googlesource.com/9243
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkPathEffect.cpp')
-rw-r--r-- | src/core/SkPathEffect.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index eb70a4d47a..6f953c5934 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -27,6 +27,8 @@ SkPathEffect::DashType SkPathEffect::asADash(DashInfo* info) const { /////////////////////////////////////////////////////////////////////////////// +#ifndef SK_SUPPORT_LEGACY_PATHEFFECT_SUBCLASSES + /** \class SkPairPathEffect Common baseclass for Compose and Sum. This subclass manages two pathEffects, @@ -138,6 +140,7 @@ private: typedef SkPairPathEffect INHERITED; }; +#endif SkPairPathEffect::SkPairPathEffect(sk_sp<SkPathEffect> pe0, sk_sp<SkPathEffect> pe1) : fPE0(std::move(pe0)), fPE1(std::move(pe1)) |