diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:25:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-31 23:25:44 +0000 |
| commit | e05575e9c36850d8cfe49396ac9a1372511b12bf (patch) | |
| tree | cd106a73af96598499f82ac5dc5fc40dabb3df4a /libs/hwui/DisplayList.h | |
| parent | 58f2a1e8a47de6c3ce4f588b07fc052f4687492d (diff) | |
| parent | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (diff) | |
| download | frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.zip frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.gz frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
automerge: a51fba0
* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
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); } |