diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:30:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 23:30:57 +0000 |
| commit | 9481684560b2815d2706512086bb36467ef6acc0 (patch) | |
| tree | e6258e3075f56533df3ec11cf1443a0d1882b17d /libs/hwui/DisplayList.h | |
| parent | bc622ed7c3f9ead17c8aede3ccc10babf0b8e0fa (diff) | |
| parent | e05575e9c36850d8cfe49396ac9a1372511b12bf (diff) | |
| download | frameworks_base-9481684560b2815d2706512086bb36467ef6acc0.zip frameworks_base-9481684560b2815d2706512086bb36467ef6acc0.tar.gz frameworks_base-9481684560b2815d2706512086bb36467ef6acc0.tar.bz2 | |
am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0
* commit 'e05575e9c36850d8cfe49396ac9a1372511b12bf':
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 1777e11..7094cc1 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -148,7 +148,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 { @@ -158,11 +157,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); } |