diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 23:00:44 +0000 |
| commit | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (patch) | |
| tree | 1b6027c164bfebbb15618ae82233833a4c807397 /libs/hwui/DisplayList.h | |
| parent | 18163616c80aa30f4b7389838d8658812615080c (diff) | |
| parent | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (diff) | |
| download | frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.zip frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.gz frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
* commit 'a8d83d639a5687b2ab5689db4ea61e2a6cce66f4':
Layer changes
Diffstat (limited to 'libs/hwui/DisplayList.h')
| -rw-r--r-- | libs/hwui/DisplayList.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index dea109c..cb8a8d1 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -147,7 +147,6 @@ public: Vector<const SkPath*> paths; SortedVector<const SkPath*> sourcePaths; Vector<const SkRegion*> regions; - Vector<Layer*> layers; Vector<Functor*> functors; const Vector<Chunk>& getChunks() const { @@ -157,11 +156,7 @@ public: size_t addChild(DrawRenderNodeOp* childOp); const Vector<DrawRenderNodeOp*>& children() { return mChildren; } - void refProperty(CanvasPropertyPrimitive* prop) { - mReferenceHolders.push(prop); - } - - void refProperty(CanvasPropertyPaint* prop) { + void ref(VirtualLightRefBase* prop) { mReferenceHolders.push(prop); } |