diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-09 18:44:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 18:44:43 -0800 |
| commit | 0d996868c3dd5af2ccb6fced488edb335185c107 (patch) | |
| tree | 452e917c4587724a8cf4ee9ebabcea9560a751a5 /src/image/SkImage.cpp | |
| parent | 1cb3646add612a90feaf4ae41e7d2a5b830bc709 (diff) | |
Restore SkImage::NewTextureFromPixmap changes.
6ceeebd37a43d879c120b6ba100ae1febdd67a18 contained the fix for the issues that prompted the revert (index8 bitmaps weren't drawing).
Revert "TBR=robertphillips@google.com"
This reverts commit 236640872fa8cad105273055fdcf6829d5c025a1.
TBR=
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1775263004
Review URL: https://codereview.chromium.org/1775263004
Diffstat (limited to 'src/image/SkImage.cpp')
| -rw-r--r-- | src/image/SkImage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 1c1c5f965c..a41ac83d19 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -348,6 +348,10 @@ bool SkImage::isLazyGenerated() const { #if !SK_SUPPORT_GPU +SkImage* SkImage::NewTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted) { + return nullptr; +} + SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType, TextureReleaseProc, ReleaseContext) { return nullptr; |