diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/TessellationCache.h | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
| download | frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.zip frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.gz frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.bz2 | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/TessellationCache.h')
| -rw-r--r-- | libs/hwui/TessellationCache.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/TessellationCache.h b/libs/hwui/TessellationCache.h index 7aaa41e..a7c50eb 100644 --- a/libs/hwui/TessellationCache.h +++ b/libs/hwui/TessellationCache.h @@ -178,8 +178,7 @@ private: // holds a pointer, and implicit strong ref to each shadow task of the frame LruCache<ShadowDescription, Task<vertexBuffer_pair_t*>*> mShadowCache; class BufferPairRemovedListener : public OnEntryRemoved<ShadowDescription, Task<vertexBuffer_pair_t*>*> { - void operator()(ShadowDescription& /* description */, - Task<vertexBuffer_pair_t*>*& bufferPairTask) { + void operator()(ShadowDescription& description, Task<vertexBuffer_pair_t*>*& bufferPairTask) { bufferPairTask->decStrong(NULL); } }; |