Commit Graph

7526 Commits

Author SHA1 Message Date
Doris Liu
f26298f8ae resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp
am: 9d5c93f

* commit '9d5c93f40758636fea18616cf915d49eca67d7b0':
  Improve error logging for parsing failures

Change-Id: I1a0a30961f939b9023480d2f3de36665ad8afab9
2016-04-08 20:48:35 +00:00
Doris Liu
9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp
Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c
2016-04-08 13:31:42 -07:00
Doris Liu
0e89f98044 Merge "Improve error logging for parsing failures" into nyc-dev 2016-04-08 18:02:51 +00:00
Doris Liu
0a1a5167be Improve error logging for parsing failures
Bug: 27043594
Change-Id: I901b65f734c49444a78e0714e007e15e2340ab9d
2016-04-08 18:01:54 +00:00
Raph Levien
34ea6b68de Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev am: c147dbb
am: eadd2b8

* commit 'eadd2b8aba89ebab859149c25779127bd755ace9':
  Avoid copying of font table data, provide raw font bytes

Change-Id: If2a32510f97d15924970e31454f805757745a9fc
2016-04-08 16:55:22 +00:00
Raph Levien
eadd2b8aba Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev
am: c147dbb

* commit 'c147dbbca4ea1870bcf88c5889e6a83865ceed54':
  Avoid copying of font table data, provide raw font bytes

Change-Id: Icf7e1aa1bc8ae759aaff94a3eeea7261a5456b47
2016-04-08 16:48:25 +00:00
Raph Levien
c147dbbca4 Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev 2016-04-08 16:32:14 +00:00
Raph Levien
296bf8c55a Avoid copying of font table data, provide raw font bytes
Minikin is changing its approach to table access to use HarfBuzz to
access the tables, based on raw font data, rather than calling the
MinikinFont::GetTable() virtual method. This patch provides raw access
to the font data to make this work.

There's a bit of plumbing to make sure fonts get a pointer to the raw
data as well.

Bug: 27860101
Change-Id: I638e18cf363644bf22fbc9fb9b3358a9e731087f
2016-04-08 08:29:32 -07:00
John Reck
7c2a570035 Merge "Make stopped state a first-class thing" into nyc-dev am: c724dcf
am: 620a86e

* commit '620a86e464d585c796e51a16dad419d46d3837e4':
  Make stopped state a first-class thing

Change-Id: Idd258fd34c68ec214e41ceb90f1d911901535802
2016-04-08 15:21:28 +00:00
John Reck
06cf0cb47a Merge "Fix a derp" into nyc-dev am: 4a73544
am: 944e6b5

* commit '944e6b51b1ee5001f6eda258d247d2efd3ad4338':
  Fix a derp

Change-Id: I14c821a4e30f5f57f0aa71fba6a3e4a1bf980982
2016-04-08 15:21:25 +00:00
John Reck
620a86e464 Merge "Make stopped state a first-class thing" into nyc-dev
am: c724dcf

* commit 'c724dcf23c5e2ebd22c042a8a6f2424b7e9d5029':
  Make stopped state a first-class thing

Change-Id: Idfa3cc5d8fa5b07c742c2700b38441ff7d692f42
2016-04-08 15:17:03 +00:00
John Reck
944e6b51b1 Merge "Fix a derp" into nyc-dev
am: 4a73544

* commit '4a735441e82207e18036be09d0d02c855930938f':
  Fix a derp

Change-Id: I1975a6ed121ad0ddfc12784c45092c8af3823bdf
2016-04-08 15:17:01 +00:00
John Reck
c724dcf23c Merge "Make stopped state a first-class thing" into nyc-dev 2016-04-08 15:09:42 +00:00
John Reck
4a735441e8 Merge "Fix a derp" into nyc-dev 2016-04-08 15:09:26 +00:00
John Reck
a41f244515 Fix a derp
Fixes: 28074465

I knew I added that flag for a reason...

Change-Id: I6e28237dcd50191769a828bf2646c3a00c14387c
2016-04-07 16:36:57 -07:00
Chris Craik
9dc4eca66b Merge "Support replace op in new pipeline" into nyc-dev am: d306065
am: 6e5c652

* commit '6e5c652347a4a260adaa197e6ceeff5829a3fb12':
  Support replace op in new pipeline

Change-Id: Ife7464f061d53a1cb39b5626ea667c26a5b95836
2016-04-07 23:34:03 +00:00
Chris Craik
6e5c652347 Merge "Support replace op in new pipeline" into nyc-dev
am: d306065

* commit 'd30606575783acd8689cfac604cba51e537b6b77':
  Support replace op in new pipeline

Change-Id: Iab37f13a5fca72b2e581a897f7e03c17f9ce0b84
2016-04-07 23:30:19 +00:00
Chris Craik
d306065757 Merge "Support replace op in new pipeline" into nyc-dev 2016-04-07 23:21:02 +00:00
John Reck
4e2838ead6 Merge "Fix some edge cases" into nyc-dev am: 4a62eff
am: c01a9b6

* commit 'c01a9b6a9ba2662fafa6f4152ca9986faacd2d66':
  Fix some edge cases

Change-Id: I52d65ed7c5da33b33a4f98953800c1dedea2bf09
2016-04-07 23:15:52 +00:00
John Reck
c01a9b6a9b Merge "Fix some edge cases" into nyc-dev
am: 4a62eff

* commit '4a62effbfe8ad9a0eb7049c2f52a57d39bb64e29':
  Fix some edge cases

Change-Id: I35a99c3164bf3bf91f609ce8bec01d15ca8b7c0d
2016-04-07 23:12:14 +00:00
John Reck
945961f78a Make stopped state a first-class thing
Bug: 27286867

WindowManager has committed to stopped state
controlling the lifecycle of the Surface, so
make that a first-class thing in HWUI as well.

This makes it more resistent to things like
a rogue updateSurface() happening while mStopped=true,
leading to bad things down the line. Instead let
the surface be changed/updated as often as desired,
and just block any attempt to draw on that surface.

Also removes some unnecessary makeCurrent()s, as
EglManager ensures that we *always* have a valid
GL context now (using a pbuffer surface if there is
no window surface set)

Change-Id: Iead78ddebc7997e8fdb0c9534836352f5e54b9bd
2016-04-07 16:02:33 -07:00
Chris Craik
04d46eb69f Support replace op in new pipeline
bug:26562461

Change-Id: Ie48d2da30f5e9d9abe88a5cd973dfb26e38abf63
2016-04-07 15:02:39 -07:00
John Reck
51f2d606dc Fix some edge cases
Bug: 27709981

This desperately needs a refactor, but to keep
the current (really needed & nice) behavior of
dispatching after sync finishes would be difficult
to handle cleanly without lots of ripping so... #yolo

Change-Id: I831a06c6ae7412a062720d68ecbe3085190f0258
2016-04-07 14:10:43 -07:00
Chris Craik
64a2e24583 Fix OffscreenBuffer leak am: 74af6e2
am: 4d5c376

* commit '4d5c3769c04dc4774ab06bd167cf621a5367bba7':
  Fix OffscreenBuffer leak

Change-Id: I7ccd370a356f955a48ca4b2edc596c42982b7774
2016-04-05 20:53:20 +00:00
Chris Craik
4d5c3769c0 Fix OffscreenBuffer leak
am: 74af6e2

* commit '74af6e282f8a8f75928a071e8200039517cf5c12':
  Fix OffscreenBuffer leak

Change-Id: I24c16488d73588efe15e64ab711f8d3bc7a580b7
2016-04-05 20:50:03 +00:00
Chris Craik
74af6e282f Fix OffscreenBuffer leak
Fixes: 27941148

Make OffscreenBuffer lifecycle an explicit (and tested) contract between
FrameBuilder and BakedOpRenderer, entirely separate from dispatch. This
makes it safe to reject any rendering work via overdraw content
rejection (before it gets to a BakedOpDispatcher).

Adds a couple tests around OffscreenBuffer leaks, and switches
OffscreenBuffer tests to RENDERTHREAD_TEST macro, as appropriate.

Change-Id: Id114b835d042708ae921028fb4b17e5fa485fe64
2016-04-05 20:42:37 +00:00
Sergei Vasilinetc
5e0f2ee2ee Merge "Fix opacity setup in FrameBuilder" into nyc-dev am: 5169c62
am: f7f9844

* commit 'f7f984425dd40f55d028e6dcb361c3ab92b2fc48':
  Fix opacity setup in FrameBuilder

Change-Id: I41104b398393ef002233a32fd161f53ba65b0219
2016-04-05 02:04:12 +00:00
sergeyv
f7f984425d Merge "Fix opacity setup in FrameBuilder" into nyc-dev
am: 5169c62

* commit '5169c62c6c0acbf9d5a36a90233e7ba2e9532e58':
  Fix opacity setup in FrameBuilder

Change-Id: Ic887d694e745d365b8e0cfe335814e0ecd8e682f
2016-04-05 01:59:30 +00:00
Sergei Vasilinetc
5169c62c6c Merge "Fix opacity setup in FrameBuilder" into nyc-dev 2016-04-05 01:54:47 +00:00
sergeyv
a82ffc549b Fix opacity setup in FrameBuilder
bug:27941278
Change-Id: Ib0599f669406d2fb477d51d5ba701a89f83f9bd9
2016-04-04 17:25:35 -07:00
Chris Craik
e93ff352fd Merge "Fix how outlines are sent to rendernode" into nyc-dev am: a7f775d
am: 517dad1

* commit '517dad11db03f2eda4d3135440122b0d4ee7539d':
  Fix how outlines are sent to rendernode

Change-Id: I3359177f304f355edd53d6dd268b7c1fe2d1d00f
2016-04-04 22:17:03 +00:00
Chris Craik
517dad11db Merge "Fix how outlines are sent to rendernode" into nyc-dev
am: a7f775d

* commit 'a7f775db93235ab25636ab2350ccf6df2729c030':
  Fix how outlines are sent to rendernode

Change-Id: I5ffd4fbd553c3b81aca4290b8c03a9837ac7f31b
2016-04-04 22:14:25 +00:00
Chris Craik
a7f775db93 Merge "Fix how outlines are sent to rendernode" into nyc-dev 2016-04-04 22:08:32 +00:00
Doris Liu
00faaafc1c Merge "Make AVD thread safe" into nyc-dev am: d928908
am: 8dcc23f

* commit '8dcc23f70d5f7eab49dafd1c1ffdc7e20afe638a':
  Make AVD thread safe

Change-Id: I02a5db8a532e9ab1366f4fd1662a5bf528bf41ee
2016-04-04 22:01:47 +00:00
Doris Liu
8dcc23f70d Merge "Make AVD thread safe" into nyc-dev
am: d928908

* commit 'd9289085be9487ac568b08048047c078b1302eb3':
  Make AVD thread safe

Change-Id: I2a9a288b0b28935870563f4b2660c3588049e735
2016-04-04 21:59:16 +00:00
Doris Liu
1d8e194661 Make AVD thread safe
This CL introduces staging properties to VectorDrawable, which holds
properties coming from UI thread. When staging properties are changed,
they are marked dirty, and the staging properties then get pushed to
RenderThread at sync point. In cases where no staging property has
been changed, at sync point we sync the render thread properties back
to staging properties to reflect the latest render thread animation
value change.

Also, update Vector Drawable bitmap only when it's dirty

Bug: 27343970
Bug: 27385912
Bug: 27263667
Bug: 27927674
Bug: 27774383

Change-Id: Ia864f5400a53a08dbfb284fae581fb1aac4fff87
2016-04-04 14:40:17 -07:00
Chris Craik
136d1af1cc Fix how outlines are sent to rendernode
bug:27918183

Fixes an issue where all convex outlines were pushed as empty rects to
RenderNode.

Also adds outline/reveal clip property logging, so such issues are
easier to debug in the future.

Change-Id: Ic4a996ecd09a8ef84cdf8b963bdb4853c7f6d180
2016-04-04 13:40:39 -07:00
John Reck
8fdf729fb7 Merge "Add a callback for rendernode parentcount=0" into nyc-dev am: bbb4c2e
am: 3c77e5a

* commit '3c77e5aa9d219193ba8a8e5f33ad23e63f55d4f5':
  Add a callback for rendernode parentcount=0

Change-Id: Ia49e05a9235d16249553b8638f9a2dad894f2198
2016-03-31 18:34:35 +00:00
John Reck
3c77e5aa9d Merge "Add a callback for rendernode parentcount=0" into nyc-dev
am: bbb4c2e

* commit 'bbb4c2eb2e871977289a9c48f414962e46b56ddc':
  Add a callback for rendernode parentcount=0

Change-Id: I8168b028ce61413da8ecea76e6531c5dde9ddb46
2016-03-31 18:31:30 +00:00
John Reck
bbb4c2eb2e Merge "Add a callback for rendernode parentcount=0" into nyc-dev 2016-03-31 18:24:49 +00:00
Chris Craik
0334f10170 Merge "Fix layer damage and clipping for Text shadows" into nyc-dev am: 08f41df
am: 4f6bb3e

* commit '4f6bb3e0127bbce2269425e38f4c2c7a7900f197':
  Fix layer damage and clipping for Text shadows

Change-Id: Iee78899cd44291eaf0598b4e0be93fa3d31642ef
2016-03-31 17:55:09 +00:00
John Reck
a950f41ae4 Merge "Expand JankTracker" into nyc-dev am: c48dd5d
am: 6fa7b46

* commit '6fa7b4616e684f723f6eed1df2b0409cb103c716':
  Expand JankTracker

Change-Id: I3d8a1054fa52947aa83477837fd3bc0f919ad778
2016-03-31 17:54:12 +00:00
Chris Craik
4f6bb3e012 Merge "Fix layer damage and clipping for Text shadows" into nyc-dev
am: 08f41df

* commit '08f41dfb8c43e8d34d8723ef22fe96b580af4d56':
  Fix layer damage and clipping for Text shadows

Change-Id: I17147a76c8f02dd2933cc8ac5664d889ba7d0c26
2016-03-31 17:49:15 +00:00
John Reck
6fa7b4616e Merge "Expand JankTracker" into nyc-dev
am: c48dd5d

* commit 'c48dd5d81e2fadf33314f0e738fd9fc406c6c533':
  Expand JankTracker

Change-Id: I2c3c5a8e5a8d279f1457be6050674d5208135727
2016-03-31 17:49:00 +00:00
Chris Craik
08f41dfb8c Merge "Fix layer damage and clipping for Text shadows" into nyc-dev 2016-03-31 17:08:04 +00:00
John Reck
660108075e Expand JankTracker
Bug: 27922347

* Dump the full histogram
* Expand the histogram to have a slow-frame section with
  large 50ms buckets to raise the cap to 5s to give more
  insight into system-health
* Stop excluding first-frame metrics as we want to include
  those in our global tracking. Automated tests already filter
  these out by doing resets before running anyway.

Change-Id: Idaba8aad591f59d10a6477b11efc0767ff715083
2016-03-31 08:40:23 -07:00
John Reck
44b49f070a Add a callback for rendernode parentcount=0
Bug: 27709981
Fixes: 22565656

Change-Id: I1cb4461baf9069dc4e7ca6de10d5862578c107f4
2016-03-31 08:36:50 -07:00
Chris Craik
70969ccde4 Fix layer damage and clipping for Text shadows
Fixes: 27787426

Change-Id: I4c65cca0cfcd343a9cfbaedd3a32b83f90df2ecf
2016-03-30 18:09:18 -07:00
Adam Lesinski
ceec846a3e Merge "AAPT2: Suppress warnings from libandroidfw when built for host" into nyc-dev am: 30cadc2
am: 6176087

* commit '617608769d3543085d55f460e00528e7388bc5de':
  AAPT2: Suppress warnings from libandroidfw when built for host

Change-Id: I0b240dd4487bc5f936dbaf94eabde931330a9f8a
2016-03-30 23:44:03 +00:00
Adam Lesinski
617608769d Merge "AAPT2: Suppress warnings from libandroidfw when built for host" into nyc-dev
am: 30cadc2

* commit '30cadc25293b82c6f142ead81ef10563ed52bf99':
  AAPT2: Suppress warnings from libandroidfw when built for host

Change-Id: I53cdedcfb71db41226d6bb07c3e2a8cca70b8320
2016-03-30 23:39:02 +00:00