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

6413 Commits

Author SHA1 Message Date
Adam Lesinski
47fe60a643 Merge "Output modified bcp47 tag in ResTable_config::toString()" 2015-03-20 20:46:40 +00:00
Chris Craik
c6128bae43 Fix clang build 
Change-Id: I5336ac347123671a18401121c5f001c8f7caf54d
 2015-03-19 10:00:56 -07:00
Chris Craik
e2bb380bc2 Use glops for text rendering 
Change-Id: I5e155c8baf3149f0ff231ec3c89dbff6bb8eae92
 2015-03-18 16:10:24 -07:00
Adam Lesinski
8a9355a98e Output modified bcp47 tag in ResTable_config::toString() 
We expect to be able to parse the output of ResTable_config::toString(),
so it should use modified bcp47 (b+en+Latn+US).

Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
 2015-03-16 22:25:26 +00:00
Derek Sollenberger
dc16e24afc Merge "Add conic support to HWUI path tessellator." 2015-03-16 19:40:08 +00:00
Derek Sollenberger
b0772a6cc5 Add conic support to HWUI path tessellator. 
bug: 19732872
Change-Id: Ic3ae46f746325468ab972c9daf829099165eb596
 2015-03-16 15:28:16 -04:00
Mike Reed
2a1ce8a4e5 use SkFilterQuality instead of SkPaint::FilterLevel 
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
 2015-03-16 11:31:38 -04:00
Derek Sollenberger
ee248599d4 Refactor DisplayList path caching. 
This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d
 2015-03-13 08:05:55 -04:00
Vishwath Mohan
1808d437e6 Merge "Enforce null-termination in ResStringPool::stringAt" 2015-03-12 21:17:50 +00:00
Vishwath Mohan
6521a1b743 Enforce null-termination in ResStringPool::stringAt 
Rejects any non null-terminated string that a caller asks
ResStringPool::stringAt for, returning NULL instead.

The rationale for returning NULL rather than amending the string to add
a null-terminator is that conformant APK files will have all their
strings null-terminated anyway, and that this is a possible signal of a
malformed package.

Bug: 15288069
Change-Id: I370937b92f2cadf67fbd54203cbc7d1494be969f
 2015-03-11 16:36:53 -07:00
John Reck
b36016c65f Cleanups & simplifications 
Change-Id: I5ad5e3b8fe55b1528f2e20c63e5abe51d9e40ff1
 2015-03-11 11:29:13 -07:00
Vishwath Mohan
4e9e0047a2 Merge "Prevent integer overflow in ResourceTypes" 2015-03-11 00:41:38 +00:00
Chris Craik
48f650cb24 Track down unsupported texture target 
bug:19641517

Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
 2015-03-10 14:02:06 -07:00
Vishwath Mohan
6a2c23dc1b Prevent integer overflow in ResourceTypes 
Adds checks to 2 malloc() calls to ensure that the finally allocated
buffer size is not vulnerable to integer overflows. Also includes a
sanity check on the upper bound for type_info.numEntries before each
call.

Bug: 15171384
Change-Id: Ifdf0276bcca7e3d93da7c3577b9486d3c03a9d03
 2015-03-10 12:34:08 -07:00
Chris Craik
edacf22ca1 Merge "Glop based composeLayerRegion/Rect" 2015-03-10 16:29:14 +00:00
Chris Craik
182952f5ee Glop based composeLayerRegion/Rect 
Change-Id: I69440cabca84948e8aaead9479d616ebc2496517
 2015-03-09 18:06:32 -07:00
Chris Craik
0a75d4e96c Merge "Rewrite glop texture asserts" 2015-03-09 20:40:08 +00:00
Chris Craik
eb911c2b0e Rewrite glop texture asserts 
bug:19641517

Also switch Glop VertexAttribFlags to use int for group of flags.

Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
 2015-03-09 13:36:35 -07:00
Chih-Hung Hsieh
7830c81cd2 Merge "Fix unused local variale warning from clang/llvm." 2015-03-07 01:13:50 +00:00
Chih-Hung Hsieh
9ad6ac08a9 Fix unused local variale warning from clang/llvm. 
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
 2015-03-06 17:07:57 -08:00
John Reck
aa35d91905 Merge "Add percentiles" 2015-03-06 23:47:26 +00:00
John Reck
e70c5754d0 Add percentiles 
Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59
 2015-03-06 15:40:03 -08:00
Derek Sollenberger
c0bf700441 SkPorterDuff Multiply mode maps to SkXfermode modulate. 
bug:19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
 2015-03-06 13:51:04 -05:00
Chris Craik
97a351a329 Merge "Avoid invalid shader creation for certain blend modes" 2015-03-06 18:44:17 +00:00
Chris Craik
1c1c3fe9eb Avoid invalid shader creation for certain blend modes 
bug:19627342

Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
 2015-03-06 10:05:15 -08:00
Derek Sollenberger
0313f2680c Remove uncessary include for SkPorterDuff.h 
Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911
 2015-03-05 16:22:17 -05:00
Tom Hudson
8124e6a98c Merge "Fix bug, change crashes to warnings" 2015-03-05 15:40:46 +00:00
Tom Hudson
b1476ae7d5 Fix bug, change crashes to warnings 
Improve behavior when we get a call to draw 0 points.
Replace one ALWAYS_FATAL statements with noop.

Change-Id: I864b7a9633dfa3dc6eefa403beca4cc7ae14074f
 2015-03-05 10:31:52 -05:00
Chris Craik
8820fd1d82 Patch cleanup, reenable Patch Glops 
bug:19597454

Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
 2015-03-04 15:32:47 -08:00
Chris Craik
a9761e698e Temporarily disable Patch glops 
bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
 2015-03-04 14:25:10 -08:00
Chris Craik
9b98afca76 Merge "Glop DrawPatch support" 2015-03-03 18:12:27 +00:00
Chris Craik
e2e0073e88 Merge "Glop drawBitmaps, drawPatches" 2015-03-03 18:02:01 +00:00
Chris Craik
0556d90253 Glop DrawPatch support 
Change-Id: Icaa78bdb2cf52c1fc2194ec4016634967d17fb6a
 2015-03-03 09:54:14 -08:00
Chris Craik
a6b52198b9 Glop drawBitmaps, drawPatches 
Change-Id: I3f1cd3f47f97d2e0c9b9d153732e26ee0b1c58c2
 2015-03-03 08:58:14 -08:00
Chris Craik
e5c6584a40 Constructor cleanup 
Change-Id: Ic39911d08f44c3174de91fb92fcd4cab73fe4654
 2015-03-02 17:56:06 -08:00
Chris Craik
083e733e82 Cleanup of FontRenderer 
Remove invalid and over complicated buffer unbinding
optimization, and simplify constructor.

Change-Id: I3dd90528de4f377e972bbd7967e7e232875387e4
 2015-02-27 17:09:02 -08:00
Chris Craik
6b109c7498 Fix glop rendering within unclipped saveLayers 
bug:19541881

Additionally, clean up GlopBuilders
and rename onGetSnapshot() for clarity

Change-Id: I0303e4cd61eef87cf80af2d968c4aa67193cd008
 2015-02-27 16:13:26 -08:00
Chris Craik
26bf34200e Glop TextureLayer support 
Change-Id: I348a926bd4a2f47be9fdbe74058c0aa2f8dc6276
 2015-02-27 10:50:12 -08:00
Chris Craik
b11be294b1 Merge "Glop mesh reorg, support for drawBitmapMesh" 2015-02-26 19:04:42 +00:00
Chris Craik
ef2507439c Glop mesh reorg, support for drawBitmapMesh 
Change-Id: Iaf5550bdd93da93e59a5b838234ab5612e067387
 2015-02-26 10:56:07 -08:00
Chris Craik
ddd30928a7 Merge "Remove renderer abstract class" 2015-02-26 00:08:12 +00:00
Chris Craik
1a83127881 Merge "Glop support for custom textured UVs, simplify drawBitmap(src,dst)" 2015-02-26 00:04:20 +00:00
John Reck
fb10ffe484 Merge "Add null egl/gles stub support" 2015-02-26 00:01:48 +00:00
John Reck
041b985dbb Add null egl/gles stub support 
Change-Id: I41372585202f69ef31a4ef95efc75fb7a1ff7289
 2015-02-25 16:00:02 -08:00
Chris Craik
03ae272459 Remove renderer abstract class 
No longer needed, allowing vast majority of methods on
OpenGLRenderer to be non-virtual.

Change-Id: I8a6ee042b95050dc666887579ef4e1c7a8f9b33b
 2015-02-25 15:51:58 -08:00
Chris Craik
14100ac9f8 Glop support for custom textured UVs, simplify drawBitmap(src,dst) 
Front load the scaling-to-support-shaders to record time.

Change-Id: I861c82d9d16d3c5e063cf87230127eed0b3f9b54
 2015-02-25 10:18:46 -08:00
Narayan Kamath
23eeb2b8ae am 287c53f4: am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
  Track removal of refcounts from FileMap.
 2015-02-24 13:09:55 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00
Chris Craik
bbcec73309 Merge "Fix atrace saveLayer flag logging" 2015-02-24 00:20:08 +00:00
Chris Craik
a7e5367b5c Fix atrace saveLayer flag logging 
Change-Id: I5da85284c15316c9db4cc74011b855ef8c2f7cdd
 2015-02-23 16:18:38 -08:00