Merge "Revert "resolved conflicts for merge of 220c3f4f to master"" (0da62baf) · Commits · e / os / android_frameworks_base

libs/hwui/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		# getConfig in external/skia/include/core/SkBitmap.h is deprecated.
		# Allow Gnu extension: in-class initializer of static 'const float' member.
		LOCAL_CLANG_CFLAGS += \
		-Wno-unused-parameter \
		-Wno-deprecated-declarations \
		-Wno-gnu-static-float-init

		# Only build libhwui when USE_OPENGL_RENDERER is

libs/hwui/AnimationContext.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ void AnimationContext::addAnimationHandle(AnimationHandle* handle) {
		handle->insertAfter(&mNextFrameAnimations);
		}

		void AnimationContext::startFrame(TreeInfo::TraversalMode /* mode */) {
		void AnimationContext::startFrame(TreeInfo::TraversalMode mode) {
		LOG_ALWAYS_FATAL_IF(mCurrentFrameAnimations.mNextHandle,
		"Missed running animations last frame!");
		AnimationHandle* head = mNextFrameAnimations.mNextHandle;

libs/hwui/Animator.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -246,11 +246,11 @@ CanvasPropertyPrimitiveAnimator::CanvasPropertyPrimitiveAnimator(
		, mProperty(property) {
		}

		float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* /* target */) const {
		float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* target) const {
		return mProperty->value;
		}

		void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* /* target */, float value) {
		void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* target, float value) {
		mProperty->value = value;
		}

		@@ -269,7 +269,7 @@ CanvasPropertyPaintAnimator::CanvasPropertyPaintAnimator(
		, mField(field) {
		}

		float CanvasPropertyPaintAnimator::getValue(RenderNode* /* target */) const {
		float CanvasPropertyPaintAnimator::getValue(RenderNode* target) const {
		switch (mField) {
		case STROKE_WIDTH:
		return mProperty->value.getStrokeWidth();
		@@ -285,7 +285,7 @@ static uint8_t to_uint8(float value) {
		return static_cast<uint8_t>( c < 0 ? 0 : c > 255 ? 255 : c );
		}

		void CanvasPropertyPaintAnimator::setValue(RenderNode* /* target */, float value) {
		void CanvasPropertyPaintAnimator::setValue(RenderNode* target, float value) {
		switch (mField) {
		case STROKE_WIDTH:
		mProperty->value.setStrokeWidth(value);

libs/hwui/Caches.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -386,13 +386,13 @@ private:

		bool bindIndicesBufferInternal(const GLuint buffer);

		static void eventMarkNull(GLsizei /* length /, const GLchar /* marker */) { }
		static void startMarkNull(GLsizei /* length /, const GLchar /* marker */) { }
		static void eventMarkNull(GLsizei length, const GLchar* marker) { }
		static void startMarkNull(GLsizei length, const GLchar* marker) { }
		static void endMarkNull() { }

		static void setLabelNull(GLenum /* type /, uint / object /, GLsizei / length */,
		const char* /* label */) { }
		static void getLabelNull(GLenum /* type /, uint / object /, GLsizei / bufferSize */,
		static void setLabelNull(GLenum type, uint object, GLsizei length,
		const char* label) { }
		static void getLabelNull(GLenum type, uint object, GLsizei bufferSize,
		GLsizei* length, char* label) {
		if (length) *length = 0;
		if (label) *label = '\0';

libs/hwui/DeferredDisplayList.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public:
		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) = 0;
		virtual ~Batch() {}
		virtual bool purelyDrawBatch() { return false; }
		virtual bool coversBounds(const Rect& /* bounds */) { return false; }
		virtual bool coversBounds(const Rect& bounds) { return false; }
		};

		class DrawBatch : public Batch {
		@@ -91,7 +91,7 @@ public:
		return false;
		}

		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) {
		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {
		DEFER_LOGD("%d replaying DrawBatch %p, with %d ops (batch id %x, merge id %p)",
		index, this, mOps.size(), getBatchId(), getMergeId());

		@@ -247,7 +247,7 @@ public:
		if (newClipSideFlags & kClipSide_Bottom) mClipRect.bottom = state->mClip.bottom;
		}

		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) {
		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {
		DEFER_LOGD("%d replaying MergingDrawBatch %p, with %d ops,"
		" clip flags %x (batch id %x, merge id %p)",
		index, this, mOps.size(), mClipSideFlags, getBatchId(), getMergeId());
		@@ -291,7 +291,7 @@ public:
		// creates a single operation batch
		StateOpBatch(const StateOp* op, const DeferredDisplayState* state) : mOp(op), mState(state) {}

		virtual void replay(OpenGLRenderer& renderer, Rect& /* dirty /, int / index */) {
		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {
		DEFER_LOGD("replaying state op batch %p", this);
		renderer.restoreDisplayState(*mState);

		@@ -309,10 +309,10 @@ private:

		class RestoreToCountBatch : public Batch {
		public:
		RestoreToCountBatch(const StateOp* /* op /, const DeferredDisplayState state,
		int restoreCount) : mState(state), mRestoreCount(restoreCount) {}
		RestoreToCountBatch(const StateOp* op, const DeferredDisplayState* state, int restoreCount) :
		mState(state), mRestoreCount(restoreCount) {}

		virtual void replay(OpenGLRenderer& renderer, Rect& /* dirty /, int / index */) {
		virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {
		DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount);

		renderer.restoreDisplayState(*mState);