diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-08-14 16:44:52 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-12-12 15:28:54 -0500 |
| commit | ca79cf69d09efa0c327e9b1237d86a119aea5da7 (patch) | |
| tree | 0fd02203babacee45f23ba19f869f869f3de0f54 /media | |
| parent | dbc8cee1d500702bc8b1a8cb6a6c0961ab4ae0ed (diff) | |
| download | frameworks_base-ca79cf69d09efa0c327e9b1237d86a119aea5da7.zip frameworks_base-ca79cf69d09efa0c327e9b1237d86a119aea5da7.tar.gz frameworks_base-ca79cf69d09efa0c327e9b1237d86a119aea5da7.tar.bz2 | |
Update framework to support r5967 of Skia.
bug: 6906025
Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/omxjpegdecoder/SkOmxPixelRef.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/tests/omxjpegdecoder/SkOmxPixelRef.h b/media/tests/omxjpegdecoder/SkOmxPixelRef.h index afedcbd..374604c 100644 --- a/media/tests/omxjpegdecoder/SkOmxPixelRef.h +++ b/media/tests/omxjpegdecoder/SkOmxPixelRef.h @@ -33,6 +33,7 @@ public: //! Return the allocation size for the pixels size_t getSize() const { return mSize; } + SK_DECLARE_UNFLATTENABLE_OBJECT() protected: // overrides from SkPixelRef virtual void* onLockPixels(SkColorTable**); |