diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-18 21:35:24 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-18 21:35:24 +0000 |
| commit | 725cd8218c2f32afecfde9c1c6940ca2d045b3c5 (patch) | |
| tree | 688fa96a32f454ec31fb1d66ce9c9c14dd43d291 /src/core/SkBitmap.cpp | |
| parent | ead1efb6ba14ecf9c1ef96814b1a5311dc4cc8fb (diff) | |
installPixels returns true if null-pixels -- devolving to setConfig
fixes assumptions in chrome's ui_unittests: RenderTextTest.SelectionKeepsLigatures
R=robertphillips@google.com, bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/170713006
git-svn-id: http://skia.googlecode.com/svn/trunk@13492 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index b6c2e2f65c..5b83b44a66 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -503,6 +503,11 @@ bool SkBitmap::installPixels(const SkImageInfo& info, void* pixels, size_t rb, return false; } + // No pixels means just behave like setConfig() + if (NULL == pixels) { + return true; + } + SkPixelRef* pr = SkMallocPixelRef::NewWithProc(info, rb, NULL, pixels, releaseProc, context); if (!pr) { |