Merge "Add overrides and switch to nullptr keyword for all files" (b15f21ef) · Commits · e / os / android_frameworks_base

libs/hwui/AnimationContext.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ void AnimationContext::startFrame(TreeInfo::TraversalMode mode) {
		"Missed running animations last frame!");
		AnimationHandle* head = mNextFrameAnimations.mNextHandle;
		if (head) {
		mNextFrameAnimations.mNextHandle = NULL;
		mNextFrameAnimations.mNextHandle = nullptr;
		mCurrentFrameAnimations.mNextHandle = head;
		head->mPreviousHandle = &mCurrentFrameAnimations;
		}
		@@ -84,15 +84,15 @@ void AnimationContext::callOnFinished(BaseRenderNodeAnimator* animator,

		AnimationHandle::AnimationHandle(AnimationContext& context)
		: mContext(context)
		, mPreviousHandle(NULL)
		, mNextHandle(NULL) {
		, mPreviousHandle(nullptr)
		, mNextHandle(nullptr) {
		}

		AnimationHandle::AnimationHandle(RenderNode& animatingNode, AnimationContext& context)
		: mRenderNode(&animatingNode)
		, mContext(context)
		, mPreviousHandle(NULL)
		, mNextHandle(NULL) {
		, mPreviousHandle(nullptr)
		, mNextHandle(nullptr) {
		mRenderNode->animators().setAnimationHandle(this);
		}

		@@ -114,7 +114,7 @@ void AnimationHandle::release() {
		LOG_ALWAYS_FATAL_IF(mRenderNode->animators().hasAnimators(),
		"Releasing the handle for an RenderNode with outstanding animators!");
		removeFromList();
		mRenderNode->animators().setAnimationHandle(NULL);
		mRenderNode->animators().setAnimationHandle(nullptr);
		delete this;
		}

		@@ -135,8 +135,8 @@ void AnimationHandle::removeFromList() {
		if (mNextHandle) {
		mNextHandle->mPreviousHandle = mPreviousHandle;
		}
		mPreviousHandle = NULL;
		mNextHandle = NULL;
		mPreviousHandle = nullptr;
		mNextHandle = nullptr;
		}

		} /* namespace uirenderer */

libs/hwui/Animator.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ namespace uirenderer {
		************************************************************/

		BaseRenderNodeAnimator::BaseRenderNodeAnimator(float finalValue)
		: mTarget(NULL)
		: mTarget(nullptr)
		, mFinalValue(finalValue)
		, mDeltaValue(0)
		, mFromValue(0)

libs/hwui/Animator.h

+11 −11

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public:

		void attach(RenderNode* target);
		virtual void onAttached() {}
		void detach() { mTarget = 0; }
		void detach() { mTarget = nullptr; }
		void pushStaging(AnimationContext& context);
		bool animate(AnimationContext& context);

		@@ -139,10 +139,10 @@ public:
		ANDROID_API virtual uint32_t dirtyMask();

		protected:
		virtual float getValue(RenderNode* target) const;
		virtual void setValue(RenderNode* target, float value);
		virtual void onAttached();
		virtual void onStagingPlayStateChanged();
		virtual float getValue(RenderNode* target) const override;
		virtual void setValue(RenderNode* target, float value) override;
		virtual void onAttached() override;
		virtual void onStagingPlayStateChanged() override;

		private:
		typedef bool (RenderProperties::*SetFloatProperty)(float value);
		@@ -162,8 +162,8 @@ public:
		ANDROID_API virtual uint32_t dirtyMask();

		protected:
		virtual float getValue(RenderNode* target) const;
		virtual void setValue(RenderNode* target, float value);
		virtual float getValue(RenderNode* target) const override;
		virtual void setValue(RenderNode* target, float value) override;
		private:
		sp<CanvasPropertyPrimitive> mProperty;
		};
		@@ -181,8 +181,8 @@ public:
		ANDROID_API virtual uint32_t dirtyMask();

		protected:
		virtual float getValue(RenderNode* target) const;
		virtual void setValue(RenderNode* target, float value);
		virtual float getValue(RenderNode* target) const override;
		virtual void setValue(RenderNode* target, float value) override;
		private:
		sp<CanvasPropertyPaint> mProperty;
		PaintField mField;
		@@ -196,8 +196,8 @@ public:
		ANDROID_API virtual uint32_t dirtyMask();

		protected:
		virtual float getValue(RenderNode* target) const;
		virtual void setValue(RenderNode* target, float value);
		virtual float getValue(RenderNode* target) const override;
		virtual void setValue(RenderNode* target, float value) override;

		private:
		int mCenterX, mCenterY;

libs/hwui/AnimatorManager.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -29,12 +29,12 @@ using namespace std;

		static void unref(BaseRenderNodeAnimator* animator) {
		animator->detach();
		animator->decStrong(0);
		animator->decStrong(nullptr);
		}

		AnimatorManager::AnimatorManager(RenderNode& parent)
		: mParent(parent)
		, mAnimationHandle(NULL) {
		, mAnimationHandle(nullptr) {
		}

		AnimatorManager::~AnimatorManager() {
		@@ -43,7 +43,7 @@ AnimatorManager::~AnimatorManager() {
		}

		void AnimatorManager::addAnimator(const sp<BaseRenderNodeAnimator>& animator) {
		animator->incStrong(0);
		animator->incStrong(nullptr);
		animator->attach(&mParent);
		mNewAnimators.push_back(animator.get());
		}
		@@ -87,7 +87,7 @@ public:
		dirtyMask \|= animator->dirtyMask();
		bool remove = animator->animate(mContext);
		if (remove) {
		animator->decStrong(0);
		animator->decStrong(nullptr);
		} else {
		if (animator->isRunning()) {
		mInfo.out.hasAnimations = true;
		@@ -144,7 +144,7 @@ static void endStagingAnimator(BaseRenderNodeAnimator* animator) {
		if (animator->listener()) {
		animator->listener()->onAnimationFinished(animator);
		}
		animator->decStrong(0);
		animator->decStrong(nullptr);
		}

		void AnimatorManager::endAllStagingAnimators() {
		@@ -161,7 +161,7 @@ public:

		void operator() (BaseRenderNodeAnimator* animator) {
		animator->forceEndNow(mContext);
		animator->decStrong(0);
		animator->decStrong(nullptr);
		}

		private:

libs/hwui/AssetAtlas.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ void AssetAtlas::init(sp<GraphicBuffer> buffer, int64_t* map, int count) {
		} else {
		ALOGW("Could not create atlas image");
		delete mImage;
		mImage = NULL;
		mImage = nullptr;
		}

		updateTextureId();
		@@ -57,7 +57,7 @@ void AssetAtlas::init(sp<GraphicBuffer> buffer, int64_t* map, int count) {
		void AssetAtlas::terminate() {
		if (mImage) {
		delete mImage;
		mImage = NULL;
		mImage = nullptr;
		updateTextureId();
		}
		}
		@@ -83,12 +83,12 @@ void AssetAtlas::updateTextureId() {

		AssetAtlas::Entry* AssetAtlas::getEntry(const SkBitmap* bitmap) const {
		ssize_t index = mEntries.indexOfKey(bitmap);
		return index >= 0 ? mEntries.valueAt(index) : NULL;
		return index >= 0 ? mEntries.valueAt(index) : nullptr;
		}

		Texture* AssetAtlas::getEntryTexture(const SkBitmap* bitmap) const {
		ssize_t index = mEntries.indexOfKey(bitmap);
		return index >= 0 ? mEntries.valueAt(index)->texture : NULL;
		return index >= 0 ? mEntries.valueAt(index)->texture : nullptr;
		}

		/**
		@@ -99,12 +99,12 @@ struct DelegateTexture: public Texture {
		DelegateTexture(Caches& caches, Texture* delegate): Texture(caches), mDelegate(delegate) { }

		virtual void setWrapST(GLenum wrapS, GLenum wrapT, bool bindTexture = false,
		bool force = false, GLenum renderTarget = GL_TEXTURE_2D) {
		bool force = false, GLenum renderTarget = GL_TEXTURE_2D) override {
		mDelegate->setWrapST(wrapS, wrapT, bindTexture, force, renderTarget);
		}

		virtual void setFilterMinMag(GLenum min, GLenum mag, bool bindTexture = false,
		bool force = false, GLenum renderTarget = GL_TEXTURE_2D) {
		bool force = false, GLenum renderTarget = GL_TEXTURE_2D) override {
		mDelegate->setFilterMinMag(min, mag, bindTexture, force, renderTarget);
		}