Commit Graph

7339 Commits

Author SHA1 Message Date
John Reck
d48c83d6ec Merge "Fix NPE in clearTexture()" into nyc-dev
am: 7882592

* commit '7882592d0ccbeb19d96c532f07a5bc5d432144b1':
  Fix NPE in clearTexture()
2016-03-17 18:29:41 +00:00
Chris Craik
79d911e43a Merge "Fix prep_volantis.sh freq printing" into nyc-dev
am: f9e398d

* commit 'f9e398da8e27cbef37dedad4f33be17efb0c72f6':
  Fix prep_volantis.sh freq printing
2016-03-17 18:29:38 +00:00
John Reck
7882592d0c Merge "Fix NPE in clearTexture()" into nyc-dev 2016-03-17 18:08:49 +00:00
John Reck
c101ac9cbe Merge "Move updating window position off RT" into nyc-dev
am: 969e8c3

* commit '969e8c365f7e17e5cf9ed11867a46afb9d8e97c1':
  Move updating window position off RT
2016-03-17 18:02:14 +00:00
John Reck
db009173f8 Fix NPE in clearTexture()
Change-Id: I38d261968506ab8b312584c7e688e2b148fadd1f
Fixes: 25928378
2016-03-17 11:02:07 -07:00
Chris Craik
d856e43773 Merge "Account for text op stroke in bounds calculation" into nyc-dev
am: aefcb2b

* commit 'aefcb2bd39867a287e52232d2f8a119caba644b0':
  Account for text op stroke in bounds calculation
2016-03-17 18:02:06 +00:00
Chris Craik
f9e398da8e Merge "Fix prep_volantis.sh freq printing" into nyc-dev 2016-03-17 17:59:14 +00:00
Chris Craik
dfc07dedf7 Fix prep_volantis.sh freq printing
Change-Id: I05e7e73423ae6ae7baf6f96924ed0f8cb9ad5488
2016-03-17 10:57:52 -07:00
John Reck
969e8c365f Merge "Move updating window position off RT" into nyc-dev 2016-03-17 17:43:50 +00:00
Teng-Hui Zhu
4dbac6fc6e Merge "Add fillType support to VectorDrawable" into nyc-dev
am: 71e806b

* commit '71e806b2f464b0ac85367fe008b554b44e4c5812':
  Add fillType support to VectorDrawable
2016-03-17 17:35:09 +00:00
John Reck
38f6c034d1 Move updating window position off RT
Bug: 27385141
Change-Id: I6c75b5f1d9ef55ef64dde050f71d0e28fb8714bf
2016-03-17 10:32:07 -07:00
Chris Craik
aefcb2bd39 Merge "Account for text op stroke in bounds calculation" into nyc-dev 2016-03-17 17:05:15 +00:00
Chris Craik
7c02cab0b1 Account for text op stroke in bounds calculation
bug:27410033
Change-Id: Idf5bd5d2401f458d03af11617144cbe88adaf886
2016-03-16 17:46:40 -07:00
Tenghui Zhu
71e806b2f4 Merge "Add fillType support to VectorDrawable" into nyc-dev 2016-03-16 21:13:24 +00:00
Chris Craik
972f0c3eb5 Merge "Remove unused include" into nyc-dev
am: 140b2ac

* commit '140b2ac6db9fe76a0e66f96149966fd28f2595a5':
  Remove unused include
2016-03-16 20:25:46 +00:00
Chris Craik
9aec632913 Remove unused include
This include breaks compilation when HWUI_NEW_OPS=false

Change-Id: Ia3167f1550167f96de83af4b2f25abd6903c4723
2016-03-16 13:04:03 -07:00
Teng-Hui Zhu
46591f4a2d Add fillType support to VectorDrawable
Default as non-zero, which is the same as SVG.
b/27533958

Change-Id: Id20e6d3493bb4d2b4b65d7f6cdb13586631c40e4
2016-03-16 11:03:27 -07:00
Doris Liu
3b5723612d Merge "Workaround for PathMeasure.getSegment() behavior change" into nyc-dev
am: d75f694c1a

* commit 'd75f694c1ad05dfd5576d81abda3f5251d5a6813':
  Workaround for PathMeasure.getSegment() behavior change
2016-03-16 00:24:58 +00:00
Doris Liu
d75f694c1a Merge "Workaround for PathMeasure.getSegment() behavior change" into nyc-dev 2016-03-16 00:21:14 +00:00
Doris Liu
24ba125158 Workaround for PathMeasure.getSegment() behavior change
SkPathMeasure::getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
bool startWithMoveTo) in SkPathMeasure used to ignore the case when
startD == stopD in MNC release. In NYC, the same paramaters would yield
a tiny segment, which leaves undesirable artifacts as shown in the bug
below.

Bug: 27665826
Change-Id: I8289dc32773fd55d686458183af44ff072866c6e
2016-03-15 17:01:55 -07:00
Chris Craik
e8e17bac12 Merge "Unrounded round rects are just rects" into nyc-dev
am: d06fa51e6b

* commit 'd06fa51e6b974aca0e35e2dc3b693c6a6628dfc5':
  Unrounded round rects are just rects
2016-03-14 23:56:38 +00:00
Chris Craik
d06fa51e6b Merge "Unrounded round rects are just rects" into nyc-dev 2016-03-14 23:49:37 +00:00
Chris Craik
2dbb4c46ee Unrounded round rects are just rects
Change-Id: I66517390943192e4725251b316a3d8c332c2b77d
2016-03-14 15:58:44 -07:00
Chris Craik
0874ce797c Merge "Fix flickering when layers resize in-place" into nyc-dev
am: c33609cb8b

* commit 'c33609cb8b91e048045a1a051a18ba0e1c6926cc':
  Fix flickering when layers resize in-place
2016-03-14 22:51:24 +00:00
Chris Craik
02806288d1 Fix flickering when layers resize in-place
bug:27248275
Change-Id: Ia11c93ebc1097f3735071204b6f14ca079bb9fc4
2016-03-14 13:26:25 -07:00
Chris Craik
5a6018a129 Merge "Dump full Glop in GlopBuilder::dump" into nyc-dev
am: e62beb0ebf

* commit 'e62beb0ebf267101532cbdfd4c4060c45fddcea5':
  Dump full Glop in GlopBuilder::dump
2016-03-14 17:29:56 +00:00
Chris Craik
e62beb0ebf Merge "Dump full Glop in GlopBuilder::dump" into nyc-dev 2016-03-14 17:22:27 +00:00
Chris Craik
701b3cc0db Dump full Glop in GlopBuilder::dump
Change-Id: I022b3c8c265998fd97d41f13964f4703025b338a
2016-03-11 18:39:01 -08:00
sergeyv
677a876520 Merge "Add GlopBuilder test for snapping" into nyc-dev
am: 67bd3b5256

* commit '67bd3b52563335c1773ca2b8cadcd52137ef8ea9':
  Add GlopBuilder test for snapping
2016-03-11 23:54:26 +00:00
Sergei Vasilinetc
67bd3b5256 Merge "Add GlopBuilder test for snapping" into nyc-dev 2016-03-11 23:43:10 +00:00
sergeyv
f42bf3e257 Add GlopBuilder test for snapping
Change-Id: I7aa5cddef6f0a0e78f3ade67b0446c1f76cf3d13
2016-03-11 14:33:26 -08:00
Chris Craik
f25f11ac75 Merge "Fix node rejection crash" into nyc-dev
am: e83cca3a3a

* commit 'e83cca3a3a235cf343c81ddff68e6a944ba91647':
  Fix node rejection crash
2016-03-10 23:49:01 +00:00
Chris Craik
e83cca3a3a Merge "Fix node rejection crash" into nyc-dev 2016-03-10 23:45:20 +00:00
Chris Craik
1367d2550e Fix node rejection crash
bug:27598131
Change-Id: Iea05c22ec10f92beef9c47236929eb5f860d84f9
2016-03-10 15:43:13 -08:00
Chris Craik
51cc13fe47 Merge "Fix WebView disappearing" into nyc-dev
am: ed5916d2be

* commit 'ed5916d2be70609c6ecb909ec4b3fc94a5bb1bfb':
  Fix WebView disappearing
2016-03-10 19:23:43 +00:00
Chris Craik
ed5916d2be Merge "Fix WebView disappearing" into nyc-dev 2016-03-10 19:21:13 +00:00
Chris Craik
223e3b6c2b Fix WebView disappearing
bug:27528563

Change-Id: Ib9fefa18ef9fb8eb11edd097cbadf8ab2b911576
2016-03-10 10:49:45 -08:00
Adam Lesinski
d949f59be5 Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev
am: 960b9441cf

* commit '960b9441cfcee7f214b1733641da58ff4292eda1':
  AssetManager: Cache a pre-filtered list of configurations
2016-03-10 05:11:50 +00:00
Adam Lesinski
ff5808d223 AssetManager: Cache a pre-filtered list of configurations
When we set the parameters for a ResTable, we can pre-filter which
resources match and only look at that smaller list when getting entries.
This helps A LOT with types that have many configurations, like strings
and all their various locales.

We must store the cached entries in a parallel data structure because parts
of the main Type object are shared with other ResTables, causing data races.

Bug:25499111
Change-Id: I63e37dcbd683fc9f1e7d0f3a6ed4c1c01e0fc575
2016-03-09 17:33:14 -08:00
Chris Craik
05122f0d46 Merge "Partial revert of 261725fdb2962271c222a049fcdf57bbdc8363c7" into nyc-dev
am: 727819d134

* commit '727819d134f9e8192c2c952f10adcc12191cd079':
  Partial revert of 261725fdb2
2016-03-10 00:32:06 +00:00
Chris Craik
727819d134 Merge "Partial revert of 261725fdb2962271c222a049fcdf57bbdc8363c7" into nyc-dev 2016-03-10 00:26:20 +00:00
Chris Craik
034a10bf21 Partial revert of 261725fdb2
Bug:27534946

Mapping empty rects still must be done to get correct positions for
line/point rects describing strokable bounds.

Change-Id: I2f9efe543e58eb438b755276585491c1256d6719
2016-03-09 16:14:35 -08:00
Chris Craik
03bfc8bbe6 Merge "Add initial BakedOpDispatcher tests" into nyc-dev
am: c17232598b

* commit 'c17232598b0455af288955a70fcbdb699954af4c':
  Add initial BakedOpDispatcher tests
2016-03-10 00:14:18 +00:00
Chris Craik
c17232598b Merge "Add initial BakedOpDispatcher tests" into nyc-dev 2016-03-10 00:08:46 +00:00
Chris Craik
419a1e7ef5 Add initial BakedOpDispatcher tests
bug:26571145
bug:26923968
bug:27389290

Change-Id: If8ba33732d09b335171f87d5efc419641bafa126
2016-03-09 16:03:52 -08:00
John Reck
0c809b0082 Merge "Add basic LsaVector tests" into nyc-dev
am: 99f1215607

* commit '99f1215607daf3939f06a71ce098e80be8603b9e':
  Add basic LsaVector tests
2016-03-09 20:36:17 +00:00
John Reck
99f1215607 Merge "Add basic LsaVector tests" into nyc-dev 2016-03-09 20:29:46 +00:00
John Reck
2bee0dd944 resolve merge conflicts of 77bf1bb928 to nyc-dev-plus-aosp
Change-Id: Ia876298e41f42af1fd0c3f9832468e03ea9129bc
2016-03-09 08:01:37 -08:00
John Reck
77bf1bb928 Merge "Switch hwui to google-benchmark" into nyc-dev 2016-03-09 15:20:11 +00:00
John Reck
308dba5d92 Add basic LsaVector tests
Change-Id: I57600271a4efcb63b1c24b582ead48d51f002c2e
2016-03-08 13:20:06 -08:00