summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/pixel_ref_utils_unittest.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc
index 43801b1..8a6b53f 100644
--- a/skia/ext/pixel_ref_utils_unittest.cc
+++ b/skia/ext/pixel_ref_utils_unittest.cc
@@ -30,7 +30,10 @@ class TestPixelRef : public SkPixelRef {
virtual ~TestPixelRef();
virtual SkFlattenable::Factory getFactory() const OVERRIDE;
+#ifdef SK_SUPPORT_LEGACY_ONLOCKPIXELS
virtual void* onLockPixels(SkColorTable** color_table) OVERRIDE;
+#endif
+ virtual bool onNewLockPixels(LockRec* rec) OVERRIDE;
virtual void onUnlockPixels() OVERRIDE {}
virtual SkPixelRef* deepCopy(SkBitmap::Config config, const SkIRect* subset)
OVERRIDE;
@@ -81,9 +84,21 @@ TestPixelRef::~TestPixelRef() {}
SkFlattenable::Factory TestPixelRef::getFactory() const { return NULL; }
+#ifdef SK_SUPPORT_LEGACY_ONLOCKPIXELS
void* TestPixelRef::onLockPixels(SkColorTable** color_table) {
return pixels_.get();
}
+#endif
+
+bool TestPixelRef::onNewLockPixels(LockRec* rec) {
+ if (pixels_.get()) {
+ rec->fPixels = pixels_.get();
+ rec->fColorTable = NULL;
+ rec->fRowBytes = 4 * info().fWidth;
+ return true;
+ }
+ return false;
+}
SkPixelRef* TestPixelRef::deepCopy(SkBitmap::Config config,
const SkIRect* subset) {