aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorFlorin Malita <fmalita@chromium.org>2018-10-05 10:47:31 -0400
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-10-05 15:32:25 +0000
commit9059c23946e1af3a3856e297330f867a4f4df854 (patch)
treecdcd427c188e94c31732e23131afc2b2cabeeef3 /modules
parent6be47152b6441e1ca95b8225e1d9191ce7157b69 (diff)
downloadskqp-9059c23946e1af3a3856e297330f867a4f4df854.tar.gz
[skottie] Remove temporary ResourceProvider::load() fallback
All clients are now using loadImageAsset(). TBR= Change-Id: I3d7800fc9a294b01aaa8e21a39703e01fa866a40 Reviewed-on: https://skia-review.googlesource.com/c/159946 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org> Auto-Submit: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/skottie/src/Skottie.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index e4223ccac3..3faca990ab 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -10,7 +10,6 @@
#include "SkCanvas.h"
#include "SkData.h"
#include "SkFontMgr.h"
-#include "SkImage.h"
#include "SkMakeUnique.h"
#include "SkOSPath.h"
#include "SkPaint.h"
@@ -247,23 +246,7 @@ sk_sp<SkData> ResourceProvider::load(const char[], const char[]) const {
}
sk_sp<ImageAsset> ResourceProvider::loadImageAsset(const char path[], const char name[]) const {
- // Legacy API fallback. TODO: remove after clients get updated.
- class StaticImageAsset final : public ImageAsset {
- public:
- explicit StaticImageAsset(sk_sp<SkImage> img) : fImage(std::move(img)) {}
-
- bool isMultiFrame() override { return false; }
-
- sk_sp<SkImage> getFrame(float) override { return fImage; }
-
- private:
- sk_sp<SkImage> fImage;
- };
-
- auto image = SkImage::MakeFromEncoded(this->load(path, name));
-
- return image ? sk_make_sp<StaticImageAsset>(std::move(image))
- : nullptr;
+ return nullptr;
}
sk_sp<SkData> ResourceProvider::loadFont(const char[], const char[]) const {