git.osdn.net Git - android-x86/frameworks-base.git/commit

author	Leon Scroggins III <scroggo@google.com>
	Fri, 31 Jul 2015 14:38:40 +0000 (10:38 -0400)
committer	Tom Hudson <tomhudson@google.com>
	Wed, 28 Oct 2015 17:41:38 +0000 (13:41 -0400)
commit	550780745fa28ae9a87d02331841ca5ce4f9c763
tree	849b02fc26044d1f2ec6fbce3323147e02b1cd4a	tree \| snapshot
parent	d0d316049dc791dc8e44337e69873532a218d0db	commit \| diff

Merge six commits from master-skia to master

Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec

core/jni/Android.mk		diff \| blob \| history
core/jni/android/graphics/BitmapFactory.cpp		diff \| blob \| history
core/jni/android/graphics/Graphics.cpp		diff \| blob \| history
core/jni/android_view_Surface.cpp		diff \| blob \| history
core/jni/android_view_SurfaceControl.cpp		diff \| blob \| history
core/jni/android_view_TextureView.cpp		diff \| blob \| history
libs/hwui/Android.mk		diff \| blob \| history
libs/hwui/DisplayListCanvas.cpp		diff \| blob \| history
libs/hwui/SkiaCanvas.cpp		diff \| blob \| history
libs/hwui/SkiaCanvasProxy.cpp		diff \| blob \| history
libs/hwui/SkiaCanvasProxy.h		diff \| blob \| history
libs/hwui/SkiaShader.cpp		diff \| blob \| history
libs/hwui/utils/NinePatchImpl.cpp		diff \| blob \| history