diff options
| author | John Reck <jreck@google.com> | 2015-05-01 14:42:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 14:42:51 +0000 |
| commit | 78760b4ae47f5d59a541cbcbf1fca623bae4508a (patch) | |
| tree | 0147df2dfcb399ef96050f938c4b1afa3844f775 /libs | |
| parent | 6e761c5d6b8ed2126c6544ce32db569203c46e2a (diff) | |
| parent | 3731dc220ed457e0f1e99d7ec2589e0a43872b59 (diff) | |
| download | frameworks_base-78760b4ae47f5d59a541cbcbf1fca623bae4508a.zip frameworks_base-78760b4ae47f5d59a541cbcbf1fca623bae4508a.tar.gz frameworks_base-78760b4ae47f5d59a541cbcbf1fca623bae4508a.tar.bz2 | |
Merge "A bunch more cleanups" into mnc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index cc87241..d15fa39 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -293,11 +293,11 @@ CREATE_BRIDGE3(copyLayerInto, CanvasContext* context, DeferredLayerUpdater* laye return (void*) success; } -bool RenderProxy::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) { +bool RenderProxy::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap& bitmap) { SETUP_TASK(copyLayerInto); args->context = mContext; args->layer = layer; - args->bitmap = bitmap; + args->bitmap = &bitmap; return (bool) postAndWait(task); } diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h index 29c6f08..cc475fa 100644 --- a/libs/hwui/renderthread/RenderProxy.h +++ b/libs/hwui/renderthread/RenderProxy.h @@ -83,7 +83,7 @@ public: ANDROID_API DeferredLayerUpdater* createTextureLayer(); ANDROID_API void buildLayer(RenderNode* node); - ANDROID_API bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap); + ANDROID_API bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap& bitmap); ANDROID_API void pushLayerUpdate(DeferredLayerUpdater* layer); ANDROID_API void cancelLayerUpdate(DeferredLayerUpdater* layer); ANDROID_API void detachSurfaceTexture(DeferredLayerUpdater* layer); |