Merge "Create magnifier bench scene" (67e1f2e2) · Commits · e / os / android_frameworks_base

libs/hwui/tests/common/TestScene.h

+5 −0

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

		#pragma once

		#include <gui/Surface.h>
		#include <utils/StrongPointer.h>

		#include <string>
		#include <unordered_map>

		@@ -66,6 +69,8 @@ public:

		static std::unordered_map<std::string, Info>& testMap();
		static void registerScene(const Info& info);

		sp<Surface> renderTarget;
		};

		} // namespace test

libs/hwui/tests/common/scenes/MagnifierAnimation.cpp

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "TestSceneBase.h"
		#include "renderthread/RenderProxy.h"
		#include "utils/Color.h"

		class MagnifierAnimation;

		static TestScene::Registrar _Magnifier(TestScene::Info{
		"magnifier", "A sample magnifier using Readback",
		TestScene::simpleCreateScene<MagnifierAnimation>});

		class MagnifierAnimation : public TestScene {
		public:
		sp<RenderNode> card;
		sp<RenderNode> zoomImageView;

		void createContent(int width, int height, Canvas& canvas) override {
		magnifier = TestUtils::createBitmap(200, 100);
		SkBitmap temp;
		magnifier->getSkBitmap(&temp);
		temp.eraseColor(Color::White);
		canvas.drawColor(Color::White, SkBlendMode::kSrcOver);
		card = TestUtils::createNode(
		0, 0, width, height, [&](RenderProperties& props, Canvas& canvas) {
		SkPaint paint;
		paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
		paint.setAntiAlias(true);
		paint.setTextSize(50);

		paint.setColor(Color::Black);
		TestUtils::drawUtf8ToCanvas(&canvas, "Test string", paint, 10, 400);
		});
		canvas.drawRenderNode(card.get());
		zoomImageView = TestUtils::createNode(
		100, 100, 500, 300, [&](RenderProperties& props, Canvas& canvas) {
		props.setElevation(dp(16));
		props.mutableOutline().setRoundRect(0, 0, props.getWidth(), props.getHeight(),
		dp(6), 1);
		props.mutableOutline().setShouldClip(true);
		canvas.drawBitmap(*magnifier, 0.0f, 0.0f, (float)magnifier->width(),
		(float)magnifier->height(), 0, 0, (float)props.getWidth(),
		(float)props.getHeight(), nullptr);
		});
		canvas.insertReorderBarrier(true);
		canvas.drawRenderNode(zoomImageView.get());
		canvas.insertReorderBarrier(false);
		}

		void doFrame(int frameNr) override {
		int curFrame = frameNr % 150;
		card->mutateStagingProperties().setTranslationX(curFrame);
		card->setPropertyFieldsDirty(RenderNode::X \| RenderNode::Y);
		if (renderTarget) {
		SkBitmap temp;
		magnifier->getSkBitmap(&temp);
		constexpr int x = 90;
		constexpr int y = 325;
		RenderProxy::copySurfaceInto(renderTarget, x, y, x + magnifier->width(),
		y + magnifier->height(), &temp);
		}
		}

		sk_sp<Bitmap> magnifier;
		};

libs/hwui/tests/common/scenes/TextAnimation.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/

		#include "TestSceneBase.h"
		#include "utils/Color.h"

		class TextAnimation;

libs/hwui/tests/macrobench/TestSceneRunner.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -111,8 +111,6 @@ void run(const TestScene::Info& info, const TestScene::Options& opts,
		// Switch to the real display
		gDisplay = getBuiltInDisplay();

		std::unique_ptr<TestScene> scene(info.createScene(opts));

		Properties::forceDrawFrame = true;
		TestContext testContext;
		testContext.setRenderOffscreen(opts.renderOffscreen);
		@@ -122,6 +120,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts,
		const int height = gDisplay.h;
		sp<Surface> surface = testContext.surface();

		std::unique_ptr<TestScene> scene(info.createScene(opts));
		scene->renderTarget = surface;

		sp<RenderNode> rootNode = TestUtils::createNode(
		0, 0, width, height, [&scene, width, height](RenderProperties& props, Canvas& canvas) {
		props.setClipToBounds(false);