Merge "[SurfaceFlinger] Replace NULL with nullptr." (79894211) · Commits · e / os / android_frameworks_native

services/surfaceflinger/BufferLayer.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -105,7 +105,8 @@ bool BufferLayer::isProtected() const {

		bool BufferLayer::isVisible() const {
		return !(isHiddenByPolicy()) && getAlpha() > 0.0f &&
		(getBE().compositionInfo.mBuffer != NULL \|\| getBE().compositionInfo.hwc.sidebandStream != NULL);
		(getBE().compositionInfo.mBuffer != nullptr \|\|
		getBE().compositionInfo.hwc.sidebandStream != nullptr);
		}

		bool BufferLayer::isFixedSize() const {
		@@ -377,7 +378,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		mSidebandStream = mConsumer->getSidebandStream();
		// replicated in LayerBE until FE/BE is ready to be synchronized
		getBE().compositionInfo.hwc.sidebandStream = mSidebandStream;
		if (getBE().compositionInfo.hwc.sidebandStream != NULL) {
		if (getBE().compositionInfo.hwc.sidebandStream != nullptr) {
		setTransactionFlags(eTransactionNeeded);
		mFlinger->setTransactionFlags(eTraversalNeeded);
		}
		@@ -492,7 +493,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		mConsumer->getCurrentBuffer(&getBE().compositionInfo.mBufferSlot);
		// replicated in LayerBE until FE/BE is ready to be synchronized
		mActiveBuffer = getBE().compositionInfo.mBuffer;
		if (getBE().compositionInfo.mBuffer == NULL) {
		if (getBE().compositionInfo.mBuffer == nullptr) {
		// this can only happen if the very first buffer was rejected.
		return outDirtyRegion;
		}
		@@ -508,7 +509,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime

		mRefreshPending = true;
		mFrameLatencyNeeded = true;
		if (oldBuffer == NULL) {
		if (oldBuffer == nullptr) {
		// the first time we receive a buffer, we need to trigger a
		// geometry invalidation.
		recomputeVisibleRegions = true;
		@@ -528,7 +529,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		recomputeVisibleRegions = true;
		}

		if (oldBuffer != NULL) {
		if (oldBuffer != nullptr) {
		uint32_t bufWidth = getBE().compositionInfo.mBuffer->getWidth();
		uint32_t bufHeight = getBE().compositionInfo.mBuffer->getHeight();
		if (bufWidth != uint32_t(oldBuffer->width) \|\|

services/surfaceflinger/BufferLayerConsumer.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ status_t BufferLayerConsumer::acquireBufferLocked(BufferItem* item, nsecs_t pres
		// If item->mGraphicBuffer is not null, this buffer has not been acquired
		// before, so any prior EglImage created is using a stale buffer. This
		// replaces any old EglImage with a new one (using the new buffer).
		if (item->mGraphicBuffer != NULL) {
		if (item->mGraphicBuffer != nullptr) {
		mImages[item->mSlot] = new Image(item->mGraphicBuffer, mRE);
		}

		@@ -306,8 +306,8 @@ status_t BufferLayerConsumer::updateAndReleaseLocked(const BufferItem& item,
		}

		BLC_LOGV("updateAndRelease: (slot=%d buf=%p) -> (slot=%d buf=%p)", mCurrentTexture,
		mCurrentTextureImage != NULL ? mCurrentTextureImage->graphicBufferHandle() : 0, slot,
		mSlots[slot].mGraphicBuffer->handle);
		mCurrentTextureImage != nullptr ? mCurrentTextureImage->graphicBufferHandle() : 0,
		slot, mSlots[slot].mGraphicBuffer->handle);

		// Hang onto the pointer so that it isn't freed in the call to
		// releaseBufferLocked() if we're in shared buffer mode and both buffers are
		@@ -355,7 +355,7 @@ status_t BufferLayerConsumer::updateAndReleaseLocked(const BufferItem& item,
		status_t BufferLayerConsumer::bindTextureImageLocked() {
		mRE.checkErrors();

		if (mCurrentTexture == BufferQueue::INVALID_BUFFER_SLOT && mCurrentTextureImage == NULL) {
		if (mCurrentTexture == BufferQueue::INVALID_BUFFER_SLOT && mCurrentTextureImage == nullptr) {
		BLC_LOGE("bindTextureImage: no currently-bound texture");
		mRE.bindExternalTextureImage(mTexName, RE::Image(mRE));
		return NO_INIT;
		@@ -414,11 +414,11 @@ void BufferLayerConsumer::setFilteringEnabled(bool enabled) {
		bool needsRecompute = mFilteringEnabled != enabled;
		mFilteringEnabled = enabled;

		if (needsRecompute && mCurrentTextureImage == NULL) {
		BLC_LOGD("setFilteringEnabled called with mCurrentTextureImage == NULL");
		if (needsRecompute && mCurrentTextureImage == nullptr) {
		BLC_LOGD("setFilteringEnabled called with mCurrentTextureImage == nullptr");
		}

		if (needsRecompute && mCurrentTextureImage != NULL) {
		if (needsRecompute && mCurrentTextureImage != nullptr) {
		computeCurrentTransformMatrixLocked();
		}
		}
		@@ -429,7 +429,7 @@ void BufferLayerConsumer::computeCurrentTransformMatrixLocked() {
		(mCurrentTextureImage == nullptr) ? nullptr : mCurrentTextureImage->graphicBuffer();
		if (buf == nullptr) {
		BLC_LOGD("computeCurrentTransformMatrixLocked: "
		"mCurrentTextureImage is NULL");
		"mCurrentTextureImage is nullptr");
		}
		const Rect& cropRect = canUseImageCrop(mCurrentCrop) ? Rect::EMPTY_RECT : mCurrentCrop;
		GLConsumer::computeTransformMatrix(mCurrentTransformMatrix, buf, cropRect, mCurrentTransform,
		@@ -476,7 +476,7 @@ sp<GraphicBuffer> BufferLayerConsumer::getCurrentBuffer(int* outSlot) const {
		*outSlot = mCurrentTexture;
		}

		return (mCurrentTextureImage == nullptr) ? NULL : mCurrentTextureImage->graphicBuffer();
		return (mCurrentTextureImage == nullptr) ? nullptr : mCurrentTextureImage->graphicBuffer();
		}

		Rect BufferLayerConsumer::getCurrentCrop() const {
		@@ -564,7 +564,7 @@ void BufferLayerConsumer::onSidebandStreamChanged() {
		listener = mContentsChangedListener.promote();
		}

		if (listener != NULL) {
		if (listener != nullptr) {
		listener->onSidebandStreamChanged();
		}
		}

services/surfaceflinger/BufferLayerConsumer.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ private:

		const sp<GraphicBuffer>& graphicBuffer() { return mGraphicBuffer; }
		const native_handle* graphicBufferHandle() {
		return mGraphicBuffer == NULL ? NULL : mGraphicBuffer->handle;
		return mGraphicBuffer == nullptr ? nullptr : mGraphicBuffer->handle;
		}

		const RE::Image& image() const { return mImage; }
		@@ -265,7 +265,7 @@ private:
		// computeCurrentTransformMatrixLocked computes the transform matrix for the
		// current texture. It uses mCurrentTransform and the current GraphicBuffer
		// to compute this matrix and stores it in mCurrentTransformMatrix.
		// mCurrentTextureImage must not be NULL.
		// mCurrentTextureImage must not be nullptr.
		void computeCurrentTransformMatrixLocked();

		// doFenceWaitLocked inserts a wait command into the RenderEngine command

services/surfaceflinger/Client.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ status_t Client::destroySurface(const sp<IBinder>& handle) {

		status_t Client::clearLayerFrameStats(const sp<IBinder>& handle) const {
		sp<Layer> layer = getLayerUser(handle);
		if (layer == NULL) {
		if (layer == nullptr) {
		return NAME_NOT_FOUND;
		}
		layer->clearFrameStats();
		@@ -215,7 +215,7 @@ status_t Client::clearLayerFrameStats(const sp<IBinder>& handle) const {

		status_t Client::getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outStats) const {
		sp<Layer> layer = getLayerUser(handle);
		if (layer == NULL) {
		if (layer == nullptr) {
		return NAME_NOT_FOUND;
		}
		layer->getFrameStats(outStats);

services/surfaceflinger/DisplayDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ void DisplayDevice::disconnect(HWComposer& hwc) {
		}

		bool DisplayDevice::isValid() const {
		return mFlinger != NULL;
		return mFlinger != nullptr;
		}

		int DisplayDevice::getWidth() const {