AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locking methods should only be virtual in legacy mode

Browse Source 
However, they should not be pure-virtual, otherwise the client can't migrate to the new
api independent of undef-ing the flag.

Bug: skia:6481
Change-Id: I3c9107b145c4c53297891224946b080ce729f9b0
Reviewed-on: https://skia-review.googlesource.com/13272
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-04-12 15:11:02 -04:00 committed by Skia Commit-Bot
parent 0f47a25cac
commit 9fa7403652
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/core/SkPixelRef.h
View File

@ -214,6 +214,8 @@ public:
protected:
#ifdef SK_SUPPORT_LEGACY_NO_ADDR_PIXELREF
virtual
#endif
/**
* On success, returns true and fills out the LockRec for the pixels. On
* failure returns false and ignores the LockRec parameter.
@ -221,8 +223,14 @@ protected:
* The caller will have already acquired a mutex for thread safety, so this
* method need not do that.
*/
virtual bool onNewLockPixels(LockRec*) = 0;
bool onNewLockPixels(LockRec*) {
SkASSERT(false); // should never be called
return true;
}
#ifdef SK_SUPPORT_LEGACY_NO_ADDR_PIXELREF
virtual
#endif
/**
* Balancing the previous successful call to onNewLockPixels. The locked
* pixel address will no longer be referenced, so the subclass is free to
@ -231,16 +239,9 @@ protected:
* The caller will have already acquired a mutex for thread safety, so this
* method need not do that.
*/
virtual void onUnlockPixels() = 0;
#else
bool onNewLockPixels(LockRec*) {
SkASSERT(false); // should never be called
return true;
}
void onUnlockPixels() {
SkASSERT(false); // should never be called
}
#endif
// default impl does nothing.
virtual void onNotifyPixelsChanged();