drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,219 Commits 1 Branch 0 Tags
Commit Graph

24 Commits

Author SHA1 Message Date
Leon Scroggins III
f35b989d26 Merge six commits from master-skia to master 
Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.

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

previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
 2015-10-29 12:29:03 -04:00
Tom Hudson
d8f904f256 Revert "Merge six commits from master-skia to master" 
This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
 2015-10-28 20:35:36 +00:00
Leon Scroggins III
550780745f 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
 2015-10-28 13:41:38 -04:00
Ben Wagner
b03198de9f Merge "Use static_assert instead of SK_COMPILE_ASSERT." 2015-08-20 14:56:10 +00:00
Ben Wagner
e3a40ea488 Use static_assert instead of SK_COMPILE_ASSERT. 
Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0
 2015-08-19 17:21:17 -04:00
Chris Craik
6daa13c5fa Change setMatrix behavior to only affect canvas-local matrix 
bug:22189925

This makes setMatrix(getMatrix()) work as expected, and makes setMatrix()
much more useful without changing behavior relative to a View's parent
hierarchy.

Change-Id: I608613bd27c1b9052ae583f8fd2119cf37a2f6d7
 2015-08-19 13:32:15 -07:00
Ben Wagner
d1cbc16089 Use 'new' instead of 'SkNEW'. 
There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.

Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
 2015-08-19 13:04:36 -04:00
Ben Wagner
6bbf68d05a Remove use of SkAutoSTMalloc from Android. 
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.

Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
 2015-08-19 11:26:06 -04:00
Derek Sollenberger
edca320a2b Add ninePatch support to Canvas.h 
Change-Id: Ib3202fd7c5b9f35853f286abe84b3ed009df1a81
 2015-08-14 14:59:37 -04:00
Ben Wagner
60126efd7d Use unique_ptr instead of SkAutoTDelete. 
Skia would like to make SkAutoTDelete private, given that unique_ptr
now exists and is a better standard alternative.

Change-Id: Ie21bc4546c93e2096c1e43b26eb3ef80b8f11de4
 2015-08-07 17:54:35 -04:00
Derek Sollenberger
6578a98956 Support High Contrast Text for all canvas types 
Change-Id: Iee324446798fe1a1cb32cb991f181a4af24aa93c
 2015-07-29 16:02:14 -04:00
Chris Craik
749e67438c Revert "Support High Contrast Text for all canvas types" 
bug:22820834

This reverts commit 876d56612ab8ec7032f702905d694670e6c4febd.

Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
 2015-07-29 18:14:46 +00:00
Derek Sollenberger
876d56612a Support High Contrast Text for all canvas types 
Change-Id: Ib46ba3d7c67e081872e6a4b11d294fe9a61f5bbd
 2015-07-13 15:13:15 -04:00
Derek Sollenberger
94394b3fb0 Move drawRegion from DisplayList to Canvas 
Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8
 2015-07-13 13:48:08 -04:00
Tom Hudson
ac7b6d33d2 New setLocalMatrix() operation for HWUI 
Concats any matrix passed through from DisplayListCanvas with the
initialTransform of the containing RenderNode.

BUG:22189925

Change-Id: I5ea54a6e2a29520c79a8860bde7682694e8595d2
 2015-07-09 16:15:31 -04:00
Chris Craik
5ec6a2878b Unify clipping return value behavior - true if not empty 
bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
 2015-06-23 15:42:43 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup 
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
 2015-04-22 09:34:34 -07:00
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
John Reck
c294d128d0 A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-14 15:38:22 -07:00
Tom Hudson
34e79c1e57 Convert from glyph count to byte length 
Canvas drawText* APIs are inconsistent, and this mismatch snuck through
our tests.

BUG=skia:3636
R=djsollen@google.com

Change-Id: Ibaab512c3f19df8445d582633b2748f1ec4d2902
 2015-04-14 11:34:39 -04:00
Derek Sollenberger
0313f2680c Remove uncessary include for SkPorterDuff.h 
Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911
 2015-03-05 16:22:17 -05:00
Derek Sollenberger
b3d50e0075 Rename Canvas::getSkCanvas to Canvas::asSkCanvas 
Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
 2015-01-29 11:25:55 -05:00
John Reck
849911a9c4 Move Canvas 
Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
 2015-01-20 12:39:05 -08:00