Commit Graph

8066 Commits

Author SHA1 Message Date
Matt Sarett
d4babda3aa Merge "Use SkMakeBitmapShader, avoid bitmap copy" 2016-09-20 18:49:34 +00:00
Matt Sarett
62feb3a0b4 Use SkMakeBitmapShader, avoid bitmap copy
CreateBitmapShader now forces a copy. This updates the call sites
to use SkMakeBitmapShader (in SkImagePriv.h) with
kNever_SkCopyPixelsMode.

This maintains the behavior where apps can modify the bitmap in
the shader after creating the shader.

This also ensures that the texture cache will work (since it's
based off of SkPixelRefs).

BUG:31594626
Change-Id: Ic75cb6cdc05c750b7946208e48a8127838d9c2f8
2016-09-20 11:09:11 -04:00
TreeHugger Robot
6bb05c21d8 Merge "Cleanup Xfermode" 2016-09-19 21:31:28 +00:00
John Reck
5d31a293ad Cleanup Xfermode
We only support PorterDuff Xfermodes

Removes some unneeded JNI and finalizers()

Change-Id: I4988d6b05c6fd113a8ed8f7dcbf95abe0de95060
2016-09-19 12:52:50 -07:00
TreeHugger Robot
998615076d Merge "HWUI: fix prep_buller, so it locks powerlevels for gpu" 2016-09-16 23:46:53 +00:00
sergeyv
a5c73e3839 HWUI: fix prep_buller, so it locks powerlevels for gpu
bug:31501517
Change-Id: I4c2006b66f6cb0cf2e3a94966651652c1d3d287d
2016-09-16 15:12:02 -07:00
Yuqian Li
cbba84d6fc Ignore HasAlphaLayer flag to fix b/30929229 am: 83427ff222 am: df6b413b63
am: 49d49fafb8

Change-Id: Ie454b7160dc04952dc7240bfdf004e249bc9e792
2016-09-15 14:09:37 +00:00
Yuqian Li
49d49fafb8 Ignore HasAlphaLayer flag to fix b/30929229 am: 83427ff222
am: df6b413b63

Change-Id: I994233a48472cd2d11acaa30673504b8589bc303
2016-09-15 14:02:15 +00:00
sergeyv
dcbc0e9e25 resolve merge conflicts of 0ec2fd7 to master
Change-Id: I113ede26ab42e3f9a36a52a756c38d365731e16d
2016-09-14 09:15:15 -07:00
Yuqian Li
83427ff222 Ignore HasAlphaLayer flag to fix b/30929229
BUG:30929229
Change-Id: Iebadc6b3d224efa0554cbbb99ea43f871c28722b
2016-09-14 11:44:10 -04:00
Vladislav Kaznacheev
bd46d09d84 Hold a weak reference to PointerController when handling vsync am: 33c5903e77 am: 8728a2fe53
am: 23bb30843c

Change-Id: Ifccc705f9b21fb8c24fd7fc83f99d9c58ac85b5c
2016-09-13 23:11:41 +00:00
sergeyv
0ec2fd7bc5 HWUI: track upload & recent usage in font cache am: af102bee51
am: 42c01cf62f

Change-Id: Ieb80108d520aa629c54a40d7c533bf74a71849c4
2016-09-13 02:01:28 +00:00
sergeyv
ee6aca55bd HWUI: calculate used memory in FontCache for gfxinfo am: baf29e7cf4
am: c60abfb739

Change-Id: I3f8202348a97c69d080b69329b23e388aec06f17
2016-09-13 01:59:39 +00:00
sergeyv
42c01cf62f HWUI: track upload & recent usage in font cache
am: af102bee51

Change-Id: I2c08fc8d81ce8e0a1442cb65cfec11c1981a1768
2016-09-13 01:54:15 +00:00
sergeyv
c60abfb739 HWUI: calculate used memory in FontCache for gfxinfo
am: baf29e7cf4

Change-Id: I0e100f38166f191552172bef640f73157c45b714
2016-09-13 01:53:08 +00:00
Sergei Vasilinetc
e3a9785386 Merge changes Ic26b25e7,I653571d6 into nyc-mr1-dev
* changes:
  HWUI: track upload & recent usage in font cache
  HWUI: calculate used memory in FontCache for gfxinfo
2016-09-13 01:41:12 +00:00
sergeyv
af102bee51 HWUI: track upload & recent usage in font cache
FontCacheHistoryTracker should be turned off before shipping: b/31438876

bug:30427106
Change-Id: Ic26b25e790d4ee69e484ca0cb23dc9cc522b2ed3
2016-09-12 15:45:26 -07:00
Vladislav Kaznacheev
23bb30843c Hold a weak reference to PointerController when handling vsync am: 33c5903e77
am: 8728a2fe53

Change-Id: Id131b973188298718a6f5423373af5bf54c8b18f
2016-09-09 19:42:04 +00:00
Vladislav Kaznacheev
8728a2fe53 Hold a weak reference to PointerController when handling vsync
am: 33c5903e77

Change-Id: If3e218dfdaa68953d184812884b7ed80ab16acfa
2016-09-09 19:34:21 +00:00
TreeHugger Robot
c1c0421f67 Merge "Hold a weak reference to PointerController when handling vsync" into nyc-mr1-dev 2016-09-09 19:28:10 +00:00
Vladislav Kaznacheev
33c5903e77 Hold a weak reference to PointerController when handling vsync
Currently PointerController starts listening to display events
immediately (in its constructor) and never explicitly removes
the callback. The reference dangling from the looper
prevents the PointerController instance from being deleted
when all the clients have released their references.

As a result, when USB or BT mouse is disconnected,
the mouse stays frozen on screen and only goes away
after a 15 sec inactivity timeout.

This change introduces an intermediary LooperCallback
which holds only a weak reference to PointerController.
The pointer now disappears immediately upon mouse
disconnect.

Bug: 30824220
Change-Id: I5f7208dbfa381b3e21f248cc0da402f307faa184
2016-09-09 10:03:31 -07:00
sergeyv
baf29e7cf4 HWUI: calculate used memory in FontCache for gfxinfo
bug:30427106
Change-Id: I653571d6a4e974e975fb0dc03fc2364eecbf2f84
2016-09-08 14:50:50 -07:00
John Reck
9580146f50 Add API to copy a window
Change-Id: I9bb5209010db6665be4b6f8db81a6fc1b7debc45
2016-09-07 11:41:15 -07:00
TreeHugger Robot
cc68c99c62 Merge "HWUI: prepare script for fugu" 2016-09-02 21:56:59 +00:00
TreeHugger Robot
471a63ee35 Merge "Fix texture leak" 2016-09-02 20:48:27 +00:00
Chris Craik
7cae510f41 Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9
am: b53c60876a

Change-Id: Ib9c5be43f65379770b17260c34be90fccb360277
2016-09-02 20:10:06 +00:00
sergeyv
65c7566490 HWUI: prepare script for fugu
Change-Id: I562c51258084e44ed9b53431050dfcde4f293720
2016-09-02 20:01:30 +00:00
John Reck
adde639da2 Fix EGLImage memory leak am: f8b0360298
am: 8714e02f6f

Change-Id: Ieaaaf8110cf48345d661389ef189454f3e3886dc
2016-09-02 17:53:50 +00:00
Chris Craik
b53c60876a Wait on frame work fences when frames are dropped am: 06e2e9cf4c
am: 7a14f5aeb9

Change-Id: I9f2159f2f5c8111df0c14e46cc5690cbfab9b7e9
2016-09-02 17:41:57 +00:00
John Reck
3053ac7f12 Fix texture leak
Bug: 31251593
Change-Id: Ic86729eb6089239134213588d80459d14227ade6
2016-09-02 10:14:39 -07:00
John Reck
64dd8f3c59 Merge "Fix EGLImage memory leak" 2016-09-02 15:20:36 +00:00
John Reck
8714e02f6f Fix EGLImage memory leak
am: f8b0360298

Change-Id: Ibf8adad1b0fc66fe9de2bbd86d14b67ffe73efd0
2016-09-02 15:15:13 +00:00
John Reck
02913603bd Merge "Fix EGLImage memory leak" into nyc-mr1-dev 2016-09-02 15:07:25 +00:00
John Reck
f8b0360298 Fix EGLImage memory leak
Bug: 31247709
Change-Id: I9e36206b0d7bdb75b84cd53b70f7746ca34a3469
2016-09-01 14:10:20 -07:00
John Reck
8a29c0ec86 Fix EGLImage memory leak
bug: 31247709

Change-Id: Ifb3087a6e76d0d1304f55d13e468bafbd78418da
2016-09-01 20:58:19 +00:00
Chih-hung Hsieh
e2a1cee3db Merge "Fix google-explicit-constructor warnings." am: a6b6252d8b am: 1676161c1d am: 316fa0aee7
am: 650615fb17

Change-Id: I0a37e6bd2c8e971c964dc5a4c4a6e6c228bce705
2016-09-01 18:02:04 +00:00
Chih-hung Hsieh
650615fb17 Merge "Fix google-explicit-constructor warnings." am: a6b6252d8b am: 1676161c1d
am: 316fa0aee7

Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23
2016-09-01 17:56:12 +00:00
Chih-hung Hsieh
316fa0aee7 Merge "Fix google-explicit-constructor warnings." am: a6b6252d8b
am: 1676161c1d

Change-Id: Idf7b8caca19d0062955e3423c1420c7247a900bf
2016-09-01 17:49:58 +00:00
Chih-hung Hsieh
a6b6252d8b Merge "Fix google-explicit-constructor warnings." 2016-09-01 17:33:42 +00:00
Chih-hung Hsieh
25c9f6cede Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb am: 842f1e48e7
am: 1f50f80aab

Change-Id: I713bd07fee150cc684e630045e02872b23062a5a
2016-09-01 01:26:40 +00:00
Chris Craik
06e2e9cf4c Wait on frame work fences when frames are dropped
bug:30895941

Prevents a race where frame work could interleave between frames,
causing SurfaceView position updates to be delivered out of order.

Change-Id: I01e4cc557b69dcf33e877a0e16c0d115ec95e4cc
2016-08-31 17:32:47 -07:00
Chih-hung Hsieh
1f50f80aab Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb
am: 842f1e48e7

Change-Id: I401bb7ef3a46bb317ba664667fab4a16c129e5aa
2016-08-31 17:43:44 +00:00
Chih-hung Hsieh
842f1e48e7 Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7
am: d7a69e04eb

Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99
2016-08-31 17:39:44 +00:00
Chih-Hung Hsieh
258e0e0f04 Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3 am: 007c463e64
am: 4529b6300e

Change-Id: I8bd575002330360a3bb2fe06fc31d8d4e08e6e3e
2016-08-31 00:37:25 +00:00
Chih-Hung Hsieh
a619ec70cf Fix google-explicit-constructor warnings in libs/hwui.
* Add explicit keyword to conversion constructors,
  or add NOLINT for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Id8ca42433a4fc3652e4cb13787c4cb169f20d9a9
2016-08-29 14:56:58 -07:00
Chih-Hung Hsieh
6d09d547b0 Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Ic550902559b0800bdcfc0b1d301313a909434eed
2016-08-29 14:51:31 -07:00
Chih-Hung Hsieh
4529b6300e Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3
am: 007c463e64

Change-Id: Idb404e8f99289a1492d7d3f1af938cf5c0f1c7f0
2016-08-27 00:08:36 +00:00
Chih-Hung Hsieh
007c463e64 Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38
am: e33f3472f3

Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b
2016-08-27 00:01:59 +00:00
Chih-Hung Hsieh
474081eee1 Fix misc-macro-parentheses warnings in hwui/tests.
* Add parentheses around macro parameters.
Bug: 28705665

Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
2016-08-26 15:19:47 -07:00
Martijn Coenen
2cc64692ce Merge changes from topic 'utf' am: 0a357a1a73 am: de8a6a66f6
am: 1657493c22

Change-Id: Ie675738a4f9042929d1ffb5e1ffcc7bbb5c7b217
2016-08-25 20:31:31 +00:00