Merge "Fix clang-tidy warnings in libs/hwui." (76ce8e52) · Commits · e / os / android_frameworks_base

libs/hwui/Animator.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ public:
		void forceEndNow(AnimationContext& context);

		protected:
		BaseRenderNodeAnimator(float finalValue);
		explicit BaseRenderNodeAnimator(float finalValue);
		virtual ~BaseRenderNodeAnimator();

		virtual float getValue(RenderNode* target) const = 0;

libs/hwui/AssetAtlas.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ namespace uirenderer {
		// Lifecycle
		///////////////////////////////////////////////////////////////////////////////

		void AssetAtlas::init(sp<GraphicBuffer> buffer, int64_t* map, int count) {
		void AssetAtlas::init(const sp<GraphicBuffer>& buffer, int64_t* map, int count) {
		if (mImage) {
		return;
		}

libs/hwui/AssetAtlas.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ public:
		* initialized. To re-initialize the atlas, you must
		* first call terminate().
		*/
		ANDROID_API void init(sp<GraphicBuffer> buffer, int64_t* map, int count);
		ANDROID_API void init(const sp<GraphicBuffer>& buffer, int64_t* map, int count);

		/**
		* Destroys the atlas texture. This object can be

libs/hwui/DisplayListOp.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ public:
		class DrawOp : public DisplayListOp {
		friend class MergingDrawBatch;
		public:
		DrawOp(const SkPaint* paint)
		explicit DrawOp(const SkPaint* paint)
		: mPaint(paint), mQuickRejected(false) {}

		virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
		@@ -245,7 +245,7 @@ public:
		}

		// default empty constructor for bounds, to be overridden in child constructor body
		DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }
		explicit DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }

		virtual bool getLocalBounds(Rect& localBounds) override {
		localBounds.set(mLocalBounds);
		@@ -270,7 +270,7 @@ protected:

		class SaveOp : public StateOp {
		public:
		SaveOp(int flags)
		explicit SaveOp(int flags)
		: mFlags(flags) {}

		virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
		@@ -296,7 +296,7 @@ private:

		class RestoreToCountOp : public StateOp {
		public:
		RestoreToCountOp(int count)
		explicit RestoreToCountOp(int count)
		: mCount(count) {}

		virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
		@@ -409,7 +409,7 @@ private:

		class RotateOp : public StateOp {
		public:
		RotateOp(float degrees)
		explicit RotateOp(float degrees)
		: mDegrees(degrees) {}

		virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
		@@ -468,7 +468,7 @@ private:

		class SetMatrixOp : public StateOp {
		public:
		SetMatrixOp(const SkMatrix& matrix)
		explicit SetMatrixOp(const SkMatrix& matrix)
		: mMatrix(matrix) {}

		virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
		@@ -491,7 +491,7 @@ private:

		class SetLocalMatrixOp : public StateOp {
		public:
		SetLocalMatrixOp(const SkMatrix& matrix)
		explicit SetLocalMatrixOp(const SkMatrix& matrix)
		: mMatrix(matrix) {}

		virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
		@@ -510,7 +510,7 @@ private:

		class ConcatMatrixOp : public StateOp {
		public:
		ConcatMatrixOp(const SkMatrix& matrix)
		explicit ConcatMatrixOp(const SkMatrix& matrix)
		: mMatrix(matrix) {}

		virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
		@@ -529,7 +529,7 @@ private:

		class ClipOp : public StateOp {
		public:
		ClipOp(SkRegion::Op op) : mOp(op) {}
		explicit ClipOp(SkRegion::Op op) : mOp(op) {}

		virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
		bool useQuickReject) override {
		@@ -1396,7 +1396,7 @@ private:

		class DrawFunctorOp : public DrawOp {
		public:
		DrawFunctorOp(Functor* functor)
		explicit DrawFunctorOp(Functor* functor)
		: DrawOp(nullptr), mFunctor(functor) {}

		virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {

libs/hwui/GammaFontRenderer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public:
		void endPrecaching() override;

		private:
		ShaderGammaFontRenderer(bool multiGamma);
		explicit ShaderGammaFontRenderer(bool multiGamma);

		FontRenderer* mRenderer;
		bool mMultiGamma;