Merge "When recording a child node into a parent, read staging projection property" (972d0488) · Commits · e / os / android_frameworks_base

libs/hwui/DisplayListRenderer.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,9 @@ status_t DisplayListRenderer::drawDisplayList(RenderNode* displayList,
		flags, *currentTransform());
		addDrawOp(op);
		mDisplayListData->addChild(op);
		if (displayList->isProjectionReceiver()) {

		if (displayList->stagingProperties().isProjectionReceiver()) {
		// use staging property, since recording on UI thread
		mDisplayListData->projectionReceiveIndex = mDisplayListData->displayListOps.size() - 1;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -105,6 +105,10 @@ public:
		return mDisplayListData && mDisplayListData->hasDrawOps;
		}

		const char* getName() const {
		return mName.string();
		}

		void setName(const char* name) {
		if (name) {
		char* lastPeriod = strrchr(name, '.');
		@@ -129,10 +133,6 @@ public:
		return mStagingProperties;
		}

		bool isProjectionReceiver() {
		return properties().isProjectionReceiver();
		}

		int getWidth() {
		return properties().getWidth();
		}