Merge "Remove the rest of utils/Vector.h usage" (0818228a) · Commits · e / os / android_frameworks_base

libs/hwui/Android.common.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ LOCAL_SRC_FILES := \
		utils/Blur.cpp \
		utils/GLUtils.cpp \
		utils/LinearAllocator.cpp \
		utils/SortedListImpl.cpp \
		AmbientShadow.cpp \
		AnimationContext.cpp \
		Animator.cpp \

libs/hwui/LayerCache.cpp

+10 −17

Original line number	Diff line number	Diff line
		@@ -87,9 +87,8 @@ void LayerCache::deleteLayer(Layer* layer) {
		}

		void LayerCache::clear() {
		size_t count = mCache.size();
		for (size_t i = 0; i < count; i++) {
		deleteLayer(mCache.itemAt(i).mLayer);
		for (auto entry : mCache) {
		deleteLayer(entry.mLayer);
		}
		mCache.clear();
		}
		@@ -98,11 +97,11 @@ Layer* LayerCache::get(RenderState& renderState, const uint32_t width, const uin
		Layer* layer = nullptr;

		LayerEntry entry(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);

		layer = entry.mLayer;
		layer->state = Layer::kState_RemovedFromCache;
		@@ -129,9 +128,7 @@ Layer* LayerCache::get(RenderState& renderState, const uint32_t width, const uin
		}

		void LayerCache::dump() {
		size_t size = mCache.size();
		for (size_t i = 0; i < size; i++) {
		const LayerEntry& entry = mCache.itemAt(i);
		for (auto entry : mCache) {
		ALOGD(" Layer size %dx%d", entry.mWidth, entry.mHeight);
		}
		}
		@@ -144,13 +141,9 @@ bool LayerCache::put(Layer* layer) {
		if (size < mMaxSize) {
		// TODO: Use an LRU
		while (mSize + size > mMaxSize) {
		size_t position = 0;
		#if LAYER_REMOVE_BIGGEST_FIRST
		position = mCache.size() - 1;
		#endif
		Layer* victim = mCache.itemAt(position).mLayer;
		Layer* victim = mCache.begin()->mLayer;
		deleteLayer(victim);
		mCache.removeAt(position);
		mCache.erase(mCache.begin());

		LAYER_LOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
		victim->layer.getHeight());
		@@ -160,7 +153,7 @@ bool LayerCache::put(Layer* layer) {

		LayerEntry entry(layer);

		mCache.add(entry);
		mCache.insert(entry);
		mSize += size;

		layer->state = Layer::kState_InCache;

libs/hwui/LayerCache.h

+5 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@

		#include "Debug.h"
		#include "Layer.h"
		#include "utils/SortedList.h"

		#include <set>

		namespace android {
		namespace uirenderer {
		@@ -118,12 +119,8 @@ private:
		return compare(*this, other) != 0;
		}

		friend inline int strictly_order_type(const LayerEntry& lhs, const LayerEntry& rhs) {
		return LayerEntry::compare(lhs, rhs) < 0;
		}

		friend inline int compare_type(const LayerEntry& lhs, const LayerEntry& rhs) {
		return LayerEntry::compare(lhs, rhs);
		bool operator<(const LayerEntry& other) const {
		return LayerEntry::compare(*this, other) < 0;
		}

		Layer* mLayer;
		@@ -133,7 +130,7 @@ private:

		void deleteLayer(Layer* layer);

		SortedList<LayerEntry> mCache;
		std::multiset<LayerEntry> mCache;

		uint32_t mSize;
		uint32_t mMaxSize;

libs/hwui/RenderBufferCache.cpp

+9 −12

Original line number	Diff line number	Diff line
		@@ -98,9 +98,8 @@ void RenderBufferCache::deleteBuffer(RenderBuffer* buffer) {
		}

		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* RenderBufferCache::get(GLenum format, const uint32_t width, const
		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 @@ bool RenderBufferCache::put(RenderBuffer* buffer) {
		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)",

libs/hwui/RenderBufferCache.h

+5 −10

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@
		#include <GLES2/gl2.h>

		#include "RenderBuffer.h"
		#include "utils/SortedList.h"

		#include <set>

		namespace android {
		namespace uirenderer {
		@@ -100,14 +101,8 @@ private:
		return compare(*this, other) != 0;
		}

		friend inline int strictly_order_type(const RenderBufferEntry& lhs,
		const RenderBufferEntry& rhs) {
		return RenderBufferEntry::compare(lhs, rhs) < 0;
		}

		friend inline int compare_type(const RenderBufferEntry& lhs,
		const RenderBufferEntry& rhs) {
		return RenderBufferEntry::compare(lhs, rhs);
		bool operator<(const RenderBufferEntry& other) const {
		return RenderBufferEntry::compare(*this, other) < 0;
		}

		RenderBuffer* mBuffer;
		@@ -118,7 +113,7 @@ private:

		void deleteBuffer(RenderBuffer* buffer);

		SortedList<RenderBufferEntry> mCache;
		std::multiset<RenderBufferEntry> mCache;

		uint32_t mSize;
		uint32_t mMaxSize;