| commit | e32e2b343dca94086badfe34080fb24b4215db27 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Thu Feb 14 21:35:35 2013 -0800 |
| committer | Kristian Monsen <kristianm@google.com> | Thu Feb 14 21:37:01 2013 -0800 |
| tree | b0300ddadeb62e11a1c22c4f52543efd96a8d164 | |
| parent | a55e29a4757700601e5e164cf03c868761a5f91a [diff] [blame] |
Fixup from merge, and compile fix due to different skia version Change-Id: I644c5148904893a2854207f4d566395d973d4aff
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 7398895..1587830 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp
@@ -110,6 +110,7 @@ virtual void onUnlockPixels() { } + SK_DECLARE_UNFLATTENABLE_OBJECT() private: ScreenshotClient mScreenshot; SkColorTable* fCTable;