| commit | d0419b1fe781ed21d4aa0dc80df6b3e79ed37e46 | [log] [tgz] |
|---|---|---|
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 06 17:08:27 2014 +0000 |
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 06 17:08:27 2014 +0000 |
| tree | f05a83dc474cb6e40d4aee25bbe7bb59a692e933 | |
| parent | 86b39f311e174ddbd0d2f8de8d18dd45a8a2334f [diff] [blame] |
Revert "Revert "Revert "Revert of https://codereview.chromium.org/110593003/""" This reverts commit aaa89649590323fe40f52439d9a9a3376bb3b8ae. BUG= Review URL: https://codereview.chromium.org/123223007 git-svn-id: http://skia.googlecode.com/svn/trunk@12910 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h index d893372..63e9756 100644 --- a/include/gpu/SkGrPixelRef.h +++ b/include/gpu/SkGrPixelRef.h
@@ -24,10 +24,9 @@ virtual ~SkROLockPixelsPixelRef(); protected: - // override from SkPixelRef - virtual void* onLockPixels(SkColorTable** ptr); - virtual void onUnlockPixels(); - virtual bool onLockPixelsAreWritable() const; // return false; + virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; + virtual void onUnlockPixels() SK_OVERRIDE; + virtual bool onLockPixelsAreWritable() const SK_OVERRIDE; // return false; private: SkBitmap fBitmap;