diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 13:41:14 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 13:41:14 +0000 |
| commit | c83a91f4721739f05f9df51d496d50b5d028b132 (patch) | |
| tree | 65250ae1cb608dbebfa25e96c3c31335379ccd3a /include | |
| parent | f01218725458fdb0c31b440e1b068f2c3d3c4145 (diff) | |
Revert "Revert of https://codereview.chromium.org/112783004/"
This reverts commit 3293fe57a7507541e9040eab880dcd82c43881f4.
Conflicts:
src/core/SkScaledImageCache.cpp
BUG=
Review URL: https://codereview.chromium.org/108613005
git-svn-id: http://skia.googlecode.com/svn/trunk@12663 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPixelRef.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index ec4937bea0..d4c35323bb 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -244,10 +244,15 @@ protected: acquire a mutex for thread safety, so this method need not do that. */ virtual void* onLockPixels(SkColorTable**) = 0; - /** Called when the lock count goes from 1 to 0. The caller will have - already acquire a mutex for thread safety, so this method need not do - that. - */ + + /** + * Called when the lock count goes from 1 to 0. The caller will have + * already acquire a mutex for thread safety, so this method need not do + * that. + * + * If the previous call to onLockPixels failed (i.e. returned NULL), then + * the onUnlockPixels will NOT be called. + */ virtual void onUnlockPixels() = 0; /** Default impl returns true */ |