diff options
| author |  mtklein <mtklein@google.com> | 2016-08-18 17:43:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-18 17:43:59 -0700 |
| commit | 954df2fe9f4f66655c99af08b108cb582c402c5d (patch) | |
| tree | c47d07909b7dce9dac40ab31a39c3c8b12984c23 /src/core/SkLiteDL.cpp | |
| parent | 4a16717bc7aa471fad10ec3157774771a76e5106 (diff) | |
Revert of Fast path translate() in SkCanvas and SkLiteDL. (patchset #5 id:80001 of https://codereview.chromium.org/2255283002/ )
Reason for revert:
speculative
Original issue's description:
> Fast path translate() in SkCanvas and SkLiteDL.
>
> This adds didTranslate() so that SkLiteDL (and other canvas recorders)
> can record the translate rather than the full concat.
>
> It also adds a case to SkMatrix::preTranslate() to fast path
> translate x translate -> translate (i.e. +=).
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255283002
>
> Committed: https://skia.googlesource.com/skia/+/5fa47f4fd13b3158de4599414c86d17649c2dd1c
TBR=herb@google.com,reed@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2264433002
Diffstat (limited to 'src/core/SkLiteDL.cpp')
| -rw-r--r-- | src/core/SkLiteDL.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp index c3bf976a88..c634d4825a 100644 --- a/src/core/SkLiteDL.cpp +++ b/src/core/SkLiteDL.cpp @@ -52,7 +52,7 @@ static void make_threadsafe(SkPath* path, SkMatrix* matrix) { namespace { #define TYPES(M) \ M(Save) M(Restore) M(SaveLayer) \ - M(Concat) M(SetMatrix) M(Translate) M(TranslateZ) \ + M(Concat) M(SetMatrix) M(TranslateZ) \ M(ClipPath) M(ClipRect) M(ClipRRect) M(ClipRegion) \ M(DrawPaint) M(DrawPath) M(DrawRect) M(DrawOval) M(DrawRRect) M(DrawDRRect) \ M(DrawAnnotation) M(DrawDrawable) M(DrawPicture) M(DrawShadowedPicture) \ @@ -115,14 +115,6 @@ namespace { } void makeThreadsafe() { make_threadsafe(nullptr, &matrix); } }; - struct Translate final : Op { - static const auto kType = Type::Translate; - Translate(SkScalar dx, SkScalar dy) : dx(dx), dy(dy) {} - SkScalar dx,dy; - void draw(SkCanvas* c, const SkMatrix&) { - c->translate(dx, dy); - } - }; struct TranslateZ final : Op { static const auto kType = Type::TranslateZ; TranslateZ(SkScalar dz) : dz(dz) {} @@ -547,9 +539,8 @@ void SkLiteDL::saveLayer(const SkRect* bounds, const SkPaint* paint, this->push<SaveLayer>(0, bounds, paint, backdrop, flags); } -void SkLiteDL:: concat(const SkMatrix& matrix) { this->push <Concat>(0, matrix); } -void SkLiteDL::setMatrix(const SkMatrix& matrix) { this->push<SetMatrix>(0, matrix); } -void SkLiteDL::translate(SkScalar dx, SkScalar dy) { this->push<Translate>(0, dx, dy); } +void SkLiteDL:: concat(const SkMatrix& matrix) { this->push <Concat>(0, matrix); } +void SkLiteDL::setMatrix(const SkMatrix& matrix) { this->push<SetMatrix>(0, matrix); } void SkLiteDL::translateZ(SkScalar dz) { this->push<TranslateZ>(0, dz); } void SkLiteDL::clipPath(const SkPath& path, SkRegion::Op op, bool aa) { |