Merge "Fix a derp" into nyc-dev (4a735441) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/RenderProxy.cpp

+3 −8

Original line number	Diff line number	Diff line
		@@ -52,14 +52,6 @@ namespace renderthread {
		MethodInvokeRenderTask* task = new MethodInvokeRenderTask((RunnableMethod) Bridge_ ## method); \
		ARGS(method) args = (ARGS(method) ) task->payload()

		namespace DumpFlags {
		enum {
		FrameStats = 1 << 0,
		Reset = 1 << 1,
		JankStats = 1 << 2,
		};
		};

		CREATE_BRIDGE4(createContext, RenderThread* thread, bool translucent,
		RenderNode* rootRenderNode, IContextFactory* contextFactory) {
		return new CanvasContext(*args->thread, args->translucent,
		@@ -425,6 +417,9 @@ CREATE_BRIDGE4(dumpProfileInfo, CanvasContext* context, RenderThread* thread,
		if (args->dumpFlags & DumpFlags::Reset) {
		args->context->resetFrameStats();
		}
		if (args->dumpFlags & DumpFlags::JankStats) {
		args->thread->jankTracker().dump(args->fd);
		}
		return nullptr;
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,14 @@ class ErrorChannel;
		class RenderThread;
		class RenderProxyBridge;

		namespace DumpFlags {
		enum {
		FrameStats = 1 << 0,
		Reset = 1 << 1,
		JankStats = 1 << 2,
		};
		};

		/*
		* RenderProxy is strictly single threaded. All methods must be invoked on the owning
		* thread. It is important to note that RenderProxy may be deleted while it has

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,5 +122,5 @@ void run(const TestScene::Info& info, const TestScene::Options& opts) {
		}
		}

		proxy->dumpProfileInfo(STDOUT_FILENO, 0);
		proxy->dumpProfileInfo(STDOUT_FILENO, DumpFlags::JankStats);
		}