Derek Sollenberger
f5db9b8ed4
Merge "Changes needed to roll Skia to r7527." into master-chromium
2013-02-05 18:17:56 +00:00
Derek Sollenberger
d81ec456bb
Changes needed to roll Skia to r7527.
...
Change-Id: I84aef3f8a733c869fade06021816646001532758
2013-02-04 15:42:26 -05:00
Michael Jurka
7f2e4efa96
am c24b1448: Merge "Don\'t mark recycled bitmaps as immutable"
...
# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit 'c24b14481527e2f87ddb3a156b8217d32c645b10':
Don't mark recycled bitmaps as immutable
2013-02-04 09:35:09 -08:00
Michael Jurka
c24b144815
Merge "Don't mark recycled bitmaps as immutable"
2013-02-04 17:31:17 +00:00
Michael Jurka
afce5a4008
Don't mark recycled bitmaps as immutable
...
Helps avoid Bitmap allocations in apps that use a
pool of bitmaps and recycle them
Change-Id: I787455a5207bf90d6ed9f1622e0f7f7e1a4a6704
2013-02-04 16:40:25 +01:00
Derek Sollenberger
d0351a67f1
am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."
...
# Via Android (Google) Code Review (1) and Derek Sollenberger (1)
* commit '1bce2db3b4ac17156066646171c82731c87aa4d1':
Fix return type mismatch in Region's JNI code.
2013-02-04 05:24:49 -08:00
Derek Sollenberger
1bce2db3b4
Merge "Fix return type mismatch in Region's JNI code."
2013-02-04 13:16:41 +00:00
Derek Sollenberger
250f8ef248
Fix return type mismatch in Region's JNI code.
...
bug: 7620006
Change-Id: Iddca9b3739b0c116a80a900e06cede338b868e17
2013-02-01 11:57:59 -05:00
Romain Guy
da805b149f
am c5801680: Merge "Tag HardwareRenderers with a name to help debugging"
...
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'c580168011334db756f5e68aa005d20bace69171':
Tag HardwareRenderers with a name to help debugging
2013-01-31 23:06:13 -08:00
Romain Guy
ef35927abc
Tag HardwareRenderers with a name to help debugging
...
The name of the renderer is the same as the window it belongs to.
Change-Id: Ie9adc0a1978afa026923ea41f5540eda6ba65a92
2013-01-31 19:07:29 -08:00
Derek Sollenberger
2dbd185fd0
resolved conflicts for merge of c93c6aa5 to master-chromium
...
Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46
2013-01-30 14:32:29 -05:00
Chris Craik
c93c6aa555
Merge "Object-based DisplayList recording"
2013-01-30 18:42:56 +00:00
Nick Kralevich
c906166161
am 4ec799d4: Merge "Remove dead code."
...
# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit '4ec799d4c6de7e626363659508f21ee5c3c173aa':
Remove dead code.
2013-01-30 10:00:48 -08:00
Nick Kralevich
40779e50f0
Remove dead code.
...
Setting capabiltities is handled by dalvik. This code
is never called.
Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
2013-01-30 09:29:15 -08:00
Jeff Brown
8dd68d794c
am 5988335a: Merge "Optimize Looper JNI code."
...
# Via Android (Google) Code Review (1) and Jeff Brown (1)
* commit '5988335aacdbea5b60b597fa2c52583bc655e30f':
Optimize Looper JNI code.
2013-01-28 18:18:12 -08:00
Jeff Brown
864693461b
Optimize Looper JNI code.
...
Use static native methods.
Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.
Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
2013-01-28 14:25:53 -08:00
Chris Craik
2af4635e4a
Object-based DisplayList recording
...
bug:8037003
Changes the DisplayList from using stream read/write commands to use an array of
objects manually allocated on a linear buffer.
Depends on frameworks/native change https://googleplex-android-review.googlesource.com/#/c/257695/ which adds LinearAllocator
Also changes drawRects to use float count instead of rect count, to be more like drawLines/drawPoints
Change-Id: Ia2e4a11acd8f0a757042a05cbc9e7563cb73ee47
2013-01-22 13:47:03 -08:00
Jeff Sharkey
37afa4a4ed
am 5a0252da: Merge changes Ib8b18f1b,I0d799d82,Ia6222322
...
* commit '5a0252da779a98b98c0ef5053c2d20b7bd66de34':
Always give ContentResolver a valid Context.
Define failed connections column, and reset.
Add method to get process group.
2013-01-17 18:48:22 -08:00
Jeff Sharkey
9e57c414f3
Add method to get process group.
...
Change-Id: Ia62223228a54a6a4e3cdfc5c2e8c73ee194e77ef
2013-01-17 14:12:49 -08:00
Jeff Sharkey
8c02c72475
am 54298652: Merge "Reduce TextLayoutCache logging."
...
* commit '5429865241f1e63f52fbbcf5d97fcca0ec68e793':
Reduce TextLayoutCache logging.
2013-01-17 13:00:10 -08:00
Jeff Sharkey
3f32a313db
Reduce TextLayoutCache logging.
...
Change-Id: I09ae49b0a9708de219b18b00ce5b82ee4a0b2bcd
2013-01-17 12:53:27 -08:00
Junichi Monma
7d73eb049f
am 6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
...
* commit '6d191ed99491f209168e88f3d570e89c6836285b':
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
2013-01-17 09:08:30 -08:00
Junichi Monma
6d191ed994
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
...
bug id : b/8023135
Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
2013-01-17 16:13:22 +09:00
Kristian Monsen
1893d443eb
am 2d76d4f3: Fix build break in master-chromium
...
* commit '2d76d4f35ca8d0bcb45159555aa7715b7070a751':
Fix build break in master-chromium
2013-01-15 20:20:08 -08:00
Kristian Monsen
2d76d4f35c
Fix build break in master-chromium
...
Include needed headers and sort them correctly.
Change-Id: I8557c98234d86f4d0b105182f4f191a826c9aeb5
2013-01-15 19:23:21 -08:00
Raph Levien
0728441b93
am e45113a1: Merge "Attempt to resolve build breakage on x86"
...
* commit 'e45113a1564c6e701fcc076813bee276d501c576':
Attempt to resolve build breakage on x86
2013-01-15 15:02:51 -08:00
Raph Levien
77b74d4f93
Attempt to resolve build breakage on x86
...
If the scalblnf function is not available but scalbnf is, this patch
should fix the build.
Change-Id: Id83faba3298a44d57f4c924862a15c5d2bef3ca0
2013-01-15 14:37:27 -08:00
Raph Levien
49a7e454d1
am 7cd0859a: Merge "Update framework text layout to use Harfbuzz NG"
...
* commit '7cd0859a735c0c6a489d70d5d96e44e9d1a27be8':
Update framework text layout to use Harfbuzz NG
2013-01-15 11:28:40 -08:00
Raph Levien
7cd0859a73
Merge "Update framework text layout to use Harfbuzz NG"
2013-01-15 11:25:05 -08:00
Romain Guy
616a87736d
am 61840eb0: Merge "Preliminary Support for region clipping"
...
* commit '61840eb03882e1a964ae971725bd21229c3db42c':
Preliminary Support for region clipping
2013-01-15 10:28:01 -08:00
Raph Levien
aaedde51b7
Update framework text layout to use Harfbuzz NG
...
These are the frameworks changes to use the new version of Harfbuzz.
Change-Id: Idbef325e8fc1c27a9f2296414ddb1f79b778a00e
2013-01-15 09:58:06 -08:00
Romain Guy
735738c4dd
Preliminary Support for region clipping
...
Region clipping, using Canvas.clipPath or Canvas.clipRegion, requires
a stencil buffer to be always present. In addition, extra wiring is
required in JNI and display lists.
This change only adds the necessary JNI/C++ APIs and some extra
plumbing to start the real work on properly supporting region
clipping.
A new debug define called DEBUG_CLIP_REGIONS can be used to draw
the current clip region. It is off by default, as is region
clipping.
The default implementation of clipPath() and clipRegion(), now
in native, mimics the previous Dalvik implementation to prevent
regressions.
Change-Id: I7903e7cfd7412b9b9b622566d4dbfce7bdcec00c
2013-01-14 14:27:54 -08:00
Robert Greenwalt
66900f1d17
am a268ba51: Merge "Up our DNS server support from 2 > 4"
...
* commit 'a268ba51f77527585363e48aec1be45b9ec97061':
Up our DNS server support from 2 > 4
2013-01-11 15:41:28 -08:00
Robert Greenwalt
a268ba51f7
Merge "Up our DNS server support from 2 > 4"
2013-01-11 15:38:03 -08:00
Robert Greenwalt
3c97f944eb
Up our DNS server support from 2 > 4
...
bug:5958524
Change-Id: I81a9d9293049bcfc16c15ee856887aa7ed076638
2013-01-11 09:47:46 -08:00
Derek Sollenberger
fc615a0f64
Remove calls to SkCanvas::setBitmapDevice()
...
Change-Id: Ib0aa2f65b77802b105c0e8a9d7cdde2e863d3673
2013-01-08 10:00:54 -05:00
Romain Guy
7bac55434c
am 9acd1b4f: Merge "Add visual profiling feature"
...
* commit '9acd1b4fa897f3a007dd23dc1f0471b151fa03ad':
Add visual profiling feature
2013-01-04 19:29:05 -08:00
Romain Guy
672433d90f
Add visual profiling feature
...
When profiling is enabled with debug.hwui.profile set to true,
setting debug.hwui.profile_visualizer to true will display the
profiling data directly on screen.
Change-Id: I3d5fe3f0347090815087b1cbfce66b8e76d9347b
2013-01-04 19:21:54 -08:00
Siva Velusamy
360b4d9418
am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing"
...
* commit 'af80cdd7dfa28158fa91ab374d8e6d2500de66b1':
DdmServer: add controls for OpenGL tracing
2013-01-02 09:14:06 -08:00
Siva Velusamy
af80cdd7df
Merge "DdmServer: add controls for OpenGL tracing"
2013-01-02 09:10:06 -08:00
Elliott Hughes
616e19ff51
am e2d3156b: am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"
...
* commit 'e2d3156badd95ecb1b4f6e4b07f4e3acf2f5dffa':
StringBlock_nativeCreate: Possible Leak
2012-12-28 09:59:26 -08:00
Elliott Hughes
e2d3156bad
am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"
...
* commit '2fbc67abb9c79df942e0bbff118017d6d2476cbf':
StringBlock_nativeCreate: Possible Leak
2012-12-28 09:48:23 -08:00
Victoria Lease
52403160a2
am d07d7fd0: am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
...
* commit 'd07d7fd0166a8bfecbf6fc0db81a75eedd997f1e':
Possible leak in android_emoji_EmojiFactory_newInstance
2012-12-20 14:55:35 -08:00
Victoria Lease
d07d7fd016
am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
...
* commit '5ddfa24776f971d45e5fc80189abb3edd715818d':
Possible leak in android_emoji_EmojiFactory_newInstance
2012-12-20 13:49:46 -08:00
You Kim
218a313bb0
StringBlock_nativeCreate: Possible Leak
...
osb can be leaked when osb->getError() != NO_ERROR
Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
2012-12-21 06:19:38 +09:00
Victoria Lease
fc56015bd3
Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
2012-12-20 12:09:48 -08:00
Glenn Kasten
541752cb4c
am 85487494: am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"
...
* commit '8548749404a4ddad26afbaba9f4efa6a05378046':
Leak in ToneGenerator_native_setup
2012-12-20 11:10:09 -08:00
Glenn Kasten
8548749404
am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"
...
* commit '2326be4fa9cb3b523a3ea13875e91bdc437da33d':
Leak in ToneGenerator_native_setup
2012-12-20 11:07:04 -08:00
Siva Velusamy
0c1761bd37
DdmServer: add controls for OpenGL tracing
...
Add a new JDWP packet to allow control of OpenGL tracing.
Change-Id: Ic89e2f6299238a612df2f914581049f2cbba088c
2012-12-19 16:31:56 -08:00
Glenn Kasten
ba97ad2a67
Merge "Leak in ToneGenerator_native_setup"
2012-12-19 08:47:20 -08:00