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>
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index a499111..1a35381 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1813,18 +1813,17 @@
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());
});
}