Merge "Remove unused method from RenderProxy and CanvasContext." (881c4973) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/CanvasContext.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -679,12 +679,6 @@ void CanvasContext::trimMemory(RenderThread& thread, int level) {
		}
		}

		void CanvasContext::runWithGlContext(RenderTask* task) {
		LOG_ALWAYS_FATAL_IF(!mEglManager.hasEglContext(),
		"GL context not initialized!");
		task->run();
		}

		Layer* CanvasContext::createTextureLayer() {
		mEglManager.initialize();
		return LayerRenderer::createTextureLayer(mRenderThread.renderState());

+0 −2

Original line number	Diff line number	Diff line
		@@ -108,8 +108,6 @@ public:

		static void invokeFunctor(RenderThread& thread, Functor* functor);

		void runWithGlContext(RenderTask* task);

		Layer* createTextureLayer();

		ANDROID_API static void setTextureAtlas(RenderThread& thread,

+0 −12

Original line number	Diff line number	Diff line
		@@ -265,18 +265,6 @@ void RenderProxy::invokeFunctor(Functor* functor, bool waitForCompletion) {
		}
		}

		CREATE_BRIDGE2(runWithGlContext, CanvasContext* context, RenderTask* task) {
		args->context->runWithGlContext(args->task);
		return nullptr;
		}

		void RenderProxy::runWithGlContext(RenderTask* gltask) {
		SETUP_TASK(runWithGlContext);
		args->context = mContext;
		args->task = gltask;
		postAndWait(task);
		}

		CREATE_BRIDGE1(createTextureLayer, CanvasContext* context) {
		Layer* layer = args->context->createTextureLayer();
		if (!layer) return nullptr;

+0 −2

Original line number	Diff line number	Diff line
		@@ -90,8 +90,6 @@ public:

		ANDROID_API static void invokeFunctor(Functor* functor, bool waitForCompletion);

		ANDROID_API void runWithGlContext(RenderTask* task);

		ANDROID_API DeferredLayerUpdater* createTextureLayer();
		ANDROID_API void buildLayer(RenderNode* node, TreeObserver* observer);
		ANDROID_API bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap& bitmap);