Merge "Fix tests" (c9fd313f) · Commits · e / os / android_frameworks_base

libs/hwui/BufferPool.h

+9 −4

Original line number	Diff line number	Diff line
		@@ -16,8 +16,9 @@

		#pragma once

		#include <utils/RefBase.h>
		#include <utils/Log.h>
		#include "utils/RefBase.h"
		#include "utils/Log.h"
		#include "utils/Macros.h"

		#include <atomic>
		#include <stdint.h>
		@@ -37,6 +38,7 @@ namespace uirenderer {
		class BufferPool : public VirtualLightRefBase {
		public:
		class Buffer {
		PREVENT_COPY_AND_ASSIGN(Buffer);
		public:
		int64_t* getBuffer() { return mBuffer.get(); }
		size_t getSize() { return mSize; }
		@@ -57,14 +59,17 @@ public:
		return refs - 1;
		}

		bool isUniqueRef() {
		return mRefs.load() == 1;
		}

		private:
		friend class BufferPool;

		Buffer(BufferPool* pool, size_t size) {
		Buffer(BufferPool* pool, size_t size) : mRefs(1) {
		mSize = size;
		mBuffer.reset(new int64_t[size]);
		mPool = pool;
		mRefs++;
		}

		void setPool(BufferPool* pool) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ TEST(BufferPool, acquireThenRelease) {
		ASSERT_EQ(bufferCount - i, pool->getAvailableBufferCount());
		acquiredBuffers[i] = pool->acquire();
		ASSERT_NE(nullptr, acquiredBuffers[i]);
		ASSERT_TRUE(acquiredBuffers[i]->isUniqueRef());
		}

		for (size_t i = 0; i < bufferCount; i++) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,8 @@ TEST(FrameBuilder, simpleBatching) {
		<< "Expect number of ops = 2 * loop count";
		}

		TEST(FrameBuilder, clippedMerging) {
		// TODO: Disabled due to b/26793764
		TEST(FrameBuilder, DISABLED_clippedMerging) {
		class ClippedMergingTestRenderer : public TestRendererBase {
		public:
		void onMergedBitmapOps(const MergedBakedOpList& opList) override {