Merge "AvoidXferMode -> AvoidXfermode." (9a1eefe1) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ LOCAL_SRC_FILES:= \
		android_graphics_Canvas.cpp \
		android_graphics_Picture.cpp \
		android/graphics/AutoDecodeCancel.cpp \
		android/graphics/AvoidXferMode.cpp \
		android/graphics/AvoidXfermode.cpp \
		android/graphics/Bitmap.cpp \
		android/graphics/BitmapFactory.cpp \
		android/graphics/Camera.cpp \

core/jni/android/graphics/AvoidXferMode.cpp→core/jni/android/graphics/AvoidXfermode.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		* found in the LICENSE file.
		*/

		#include "AvoidXferMode.h"
		#include "AvoidXfermode.h"
		#include "SkColorPriv.h"
		#include "SkReadBuffer.h"
		#include "SkWriteBuffer.h"
		#include "SkString.h"

		AvoidXferMode::AvoidXferMode(SkColor opColor, U8CPU tolerance, Mode mode) {
		AvoidXfermode::AvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode) {
		if (tolerance > 255) {
		tolerance = 255;
		}
		@@ -21,14 +21,14 @@ AvoidXferMode::AvoidXferMode(SkColor opColor, U8CPU tolerance, Mode mode) {
		fMode = mode;
		}

		SkFlattenable* AvoidXferMode::CreateProc(SkReadBuffer& buffer) {
		SkFlattenable* AvoidXfermode::CreateProc(SkReadBuffer& buffer) {
		const SkColor color = buffer.readColor();
		const unsigned tolerance = buffer.readUInt();
		const unsigned mode = buffer.readUInt();
		return Create(color, tolerance, (Mode)mode);
		}

		void AvoidXferMode::flatten(SkWriteBuffer& buffer) const {
		void AvoidXfermode::flatten(SkWriteBuffer& buffer) const {
		buffer.writeColor(fOpColor);
		buffer.writeUInt(fTolerance);
		buffer.writeUInt(fMode);
		@@ -71,7 +71,7 @@ static inline unsigned Accurate255To256(unsigned x) {
		return x + (x >> 7);
		}

		void AvoidXferMode::xfer32(SkPMColor dst[], const SkPMColor src[], int count,
		void AvoidXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count,
		const SkAlpha aa[]) const {
		unsigned opR = SkColorGetR(fOpColor);
		unsigned opG = SkColorGetG(fOpColor);
		@@ -120,7 +120,7 @@ static inline U16CPU SkBlend3216(SkPMColor src, U16CPU dst, unsigned scale) {
		SkAlphaBlend(SkPacked32ToB16(src), SkGetPackedB16(dst), scale));
		}

		void AvoidXferMode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
		void AvoidXfermode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
		const SkAlpha aa[]) const {
		unsigned opR = SkColorGetR(fOpColor) >> (8 - SK_R16_BITS);
		unsigned opG = SkColorGetG(fOpColor) >> (8 - SK_G16_BITS);
		@@ -160,13 +160,13 @@ void AvoidXferMode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
		}
		}

		void AvoidXferMode::xferA8(SkAlpha dst[], const SkPMColor src[], int count,
		void AvoidXfermode::xferA8(SkAlpha dst[], const SkPMColor src[], int count,
		const SkAlpha aa[]) const {
		}

		#ifndef SK_IGNORE_TO_STRING
		void AvoidXferMode::toString(SkString* str) const {
		str->append("AvoidXferMode: opColor: ");
		void AvoidXfermode::toString(SkString* str) const {
		str->append("AvoidXfermode: opColor: ");
		str->appendHex(fOpColor);
		str->appendf("distMul: %d ", fDistMul);

core/jni/android/graphics/AvoidXferMode.h→core/jni/android/graphics/AvoidXfermode.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -5,19 +5,19 @@
		* found in the LICENSE file.
		*/

		#ifndef AvoidXferMode_DEFINED
		#define AvoidXferMode_DEFINED
		#ifndef AvoidXfermode_DEFINED
		#define AvoidXfermode_DEFINED

		#include "SkColor.h"
		#include "SkTypes.h"
		#include "SkXfermode.h"

		/** \class AvoidXferMode
		/** \class AvoidXfermode

		This xfermode will draw the src everywhere except on top of the specified
		color.
		*/
		class AvoidXferMode : public SkXfermode {
		class AvoidXfermode : public SkXfermode {
		public:
		enum Mode {
		kAvoidColor_Mode, //!< draw everywhere except on the opColor
		@@ -39,8 +39,8 @@ public:
		Tolerance near 0: draw only on colors that are nearly identical to the op-color
		Tolerance near 255: draw on any colors even remotely similar to the op-color
		*/
		static AvoidXferMode* Create(SkColor opColor, U8CPU tolerance, Mode mode) {
		return SkNEW_ARGS(AvoidXferMode, (opColor, tolerance, mode));
		static AvoidXfermode* Create(SkColor opColor, U8CPU tolerance, Mode mode) {
		return SkNEW_ARGS(AvoidXfermode, (opColor, tolerance, mode));
		}

		// overrides from SkXfermode
		@@ -52,10 +52,10 @@ public:
		const SkAlpha aa[]) const override;

		SK_TO_STRING_OVERRIDE()
		SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(AvoidXferMode)
		SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(AvoidXfermode)

		protected:
		AvoidXferMode(SkColor opColor, U8CPU tolerance, Mode mode);
		AvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode);
		void flatten(SkWriteBuffer&) const override;

		private:

core/jni/android/graphics/Xfermode.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#include "GraphicsJNI.h"
		#include "core_jni_helpers.h"

		#include "AvoidXferMode.h"
		#include "AvoidXfermode.h"
		#include "SkPixelXorXfermode.h"

		namespace android {
		@@ -35,8 +35,8 @@ public:
		static jlong avoid_create(JNIEnv* env, jobject, jint opColor,
		jint tolerance, jint modeHandle)
		{
		AvoidXferMode::Mode mode = static_cast<AvoidXferMode::Mode>(modeHandle);
		return reinterpret_cast<jlong>(AvoidXferMode::Create(opColor, tolerance, mode));
		AvoidXfermode::Mode mode = static_cast<AvoidXfermode::Mode>(modeHandle);
		return reinterpret_cast<jlong>(AvoidXfermode::Create(opColor, tolerance, mode));
		}

		static jlong pixelxor_create(JNIEnv* env, jobject, jint opColor)