commit bef837dc57b47fd7fcc17c86d741cf77eac4487b
author John Reck <jreck@google.com> Wed Jul 29 16:51:05 2015 -0700
committer John Reck <jreck@google.com> Thu Jul 30 09:51:57 2015 -0700
tree bb446a9aa98f59fbcd17a64537786210418aaaef
parent 272a685f17cc4828257e521a6f62b7b17870f75e

Remove the rest of utils/Vector.h usage

Change-Id: I90ab2c17ba1903a8241cba7f623b74ed136dd845

libs/hwui/RenderBufferCache.cpp

diff --git a/libs/hwui/RenderBufferCache.cpp b/libs/hwui/RenderBufferCache.cpp
index 39e0dbf..8beed25 100644
--- a/libs/hwui/RenderBufferCache.cpp
+++ b/libs/hwui/RenderBufferCache.cpp
@@ -98,9 +98,8 @@
 }
 
 void RenderBufferCache::clear() {
-    size_t count = mCache.size();
-    for (size_t i = 0; i < count; i++) {
-        deleteBuffer(mCache.itemAt(i).mBuffer);
+    for (auto entry : mCache) {
+        deleteBuffer(entry.mBuffer);
     }
     mCache.clear();
 }
@@ -109,11 +108,11 @@
     RenderBuffer* buffer = nullptr;
 
     RenderBufferEntry entry(format, width, height);
-    ssize_t index = mCache.indexOf(entry);
+    auto iter = mCache.find(entry);
 
-    if (index >= 0) {
-        entry = mCache.itemAt(index);
-        mCache.removeAt(index);
+    if (iter != mCache.end()) {
+        entry = *iter;
+        mCache.erase(iter);
 
         buffer = entry.mBuffer;
         mSize -= buffer->getSize();
@@ -139,16 +138,14 @@
     const uint32_t size = buffer->getSize();
     if (size < mMaxSize) {
         while (mSize + size > mMaxSize) {
-            size_t position = 0;
-
-            RenderBuffer* victim = mCache.itemAt(position).mBuffer;
+            RenderBuffer* victim = mCache.begin()->mBuffer;
             deleteBuffer(victim);
-            mCache.removeAt(position);
+            mCache.erase(mCache.begin());
         }
 
         RenderBufferEntry entry(buffer);
 
-        mCache.add(entry);
+        mCache.insert(entry);
         mSize += size;
 
         RENDER_BUFFER_LOGD("Added %s render buffer (%dx%d)",