diff options
author | Derek Sollenberger <djsollen@google.com> | 2017-03-01 15:33:23 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-02 20:16:17 +0000 |
commit | d7875f57bd5f17ac27f1cb2ace25224299ff2389 (patch) | |
tree | b3592daa34cae97c713e1e6571c694ba5690a9ff /dm | |
parent | c66390560ed845dbaf8656615f6a9524da643fa4 (diff) |
Refactor SkLiteDL to no longer extend SkDrawable.
Change-Id: Ieaa849bceba0e98e4c99491c721fe945a0694e68
Reviewed-on: https://skia-review.googlesource.com/9111
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DMSrcSink.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index a4991116ca..1a353810e9 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1813,18 +1813,17 @@ Error ViaSingletonPictures::draw( Error ViaLite::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { auto size = src.size(); - SkRect bounds = {0,0, (SkScalar)size.width(), (SkScalar)size.height()}; + SkIRect bounds = {0,0, size.width(), size.height()}; return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error { - sk_sp<SkLiteDL> dl = SkLiteDL::New(bounds); - + SkLiteDL dl; SkLiteRecorder rec; - rec.reset(dl.get()); + rec.reset(&dl, bounds); Error err = src.draw(&rec); if (!err.isEmpty()) { return err; } - dl->draw(canvas); + dl.draw(canvas); return check_against_reference(bitmap, src, fSink.get()); }); } |