OSDN Git Service
John Reck [Fri, 21 Oct 2011 20:59:21 +0000 (13:59 -0700)]
am
5236e6a2: Merge "Cherry pick 94857" into ics-mr0
* commit '
5236e6a2f70997cf9dec9e93261867dd79b21738':
Cherry pick 94857
John Reck [Fri, 21 Oct 2011 17:06:23 +0000 (10:06 -0700)]
Merge "Cherry pick 94857" into ics-mr0
Kristian Monsen [Fri, 21 Oct 2011 11:48:32 +0000 (04:48 -0700)]
Merge "WebKit part of fix for bug
5307956"
Nicolas Roard [Fri, 21 Oct 2011 00:53:57 +0000 (17:53 -0700)]
am
6032fa42: Merge "Implement dual textures for layers to handle zooming correctly." into ics-mr0
* commit '
6032fa428d725097ea29fc85fc1b2c965094772b':
Implement dual textures for layers to handle zooming correctly.
Nicolas Roard [Fri, 21 Oct 2011 00:51:07 +0000 (17:51 -0700)]
Merge "Implement dual textures for layers to handle zooming correctly." into ics-mr0
Nicolas Roard [Thu, 20 Oct 2011 22:55:34 +0000 (15:55 -0700)]
Implement dual textures for layers to handle zooming correctly.
We add a new class, DualTiledTexture, that encapsulate two TiledTextures
and manage them according to the current scale factor.
bug:
5492874
Change-Id: I4ba3ff539f9242ae5102189e9623e1535e9cc28f
John Reck [Thu, 20 Oct 2011 22:23:20 +0000 (15:23 -0700)]
Cherry pick 94857
Bug:
5491573
Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859
Chris Craik [Thu, 20 Oct 2011 18:34:28 +0000 (11:34 -0700)]
am
458b4b11: Mark tiles dirty, even if repainting
* commit '
458b4b11924c3bcc70dcdd3d69f64a855870e72d':
Mark tiles dirty, even if repainting
Chris Craik [Thu, 20 Oct 2011 15:50:56 +0000 (08:50 -0700)]
Mark tiles dirty, even if repainting
bug:
5484131
The current repainting tile could avoid being painted with the newest picture if
it was repainting, since markAsDirty wouldn't change its state
Change-Id: I4f3de909984d1ceb872bf294a1da211ad87c9bcc
Steve Block [Thu, 20 Oct 2011 17:31:48 +0000 (10:31 -0700)]
Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation"
The Android Open Source Project [Thu, 20 Oct 2011 16:17:07 +0000 (09:17 -0700)]
Reconcile with ics-mr0-release
Change-Id: I631833f425688ec28b521cf0c7ac05f5575b0997
The Android Automerger [Thu, 20 Oct 2011 13:27:48 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
John Reck [Thu, 20 Oct 2011 02:08:10 +0000 (19:08 -0700)]
am
94cabcbd: Merge "Force a navcache update before requesting keyboard" into ics-mr0
* commit '
94cabcbdc194d4a28d31cfb82be98a287b8cf1c9':
Force a navcache update before requesting keyboard
John Reck [Thu, 20 Oct 2011 02:05:44 +0000 (19:05 -0700)]
Merge "Force a navcache update before requesting keyboard" into ics-mr0
The Android Automerger [Thu, 20 Oct 2011 02:00:23 +0000 (19:00 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
John Reck [Thu, 20 Oct 2011 01:10:34 +0000 (18:10 -0700)]
Force a navcache update before requesting keyboard
Bug:
5453541
Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b
Chris Craik [Wed, 19 Oct 2011 22:34:48 +0000 (15:34 -0700)]
am
81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0
* commit '
81fab713750af480b451fbd9926b7d76b7017551':
Mark tiles dirty when discarded from transfer queue
Chris Craik [Wed, 19 Oct 2011 22:34:46 +0000 (15:34 -0700)]
am
1fa411c7: fix layer updates dropping invals
* commit '
1fa411c75dc305a99ec524101550a7f297402362':
fix layer updates dropping invals
Chris Craik [Wed, 19 Oct 2011 22:32:56 +0000 (15:32 -0700)]
Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0
Chris Craik [Wed, 19 Oct 2011 21:51:45 +0000 (14:51 -0700)]
Mark tiles dirty when discarded from transfer queue
bug:
5409902
Tiles weren't always marked dirty, and could get out of the transfer queue
without being marked dirty.
Change-Id: Ia0fe71f00f61d7aede8ca7bc4a389ac417906d36
Chris Craik [Wed, 19 Oct 2011 00:49:58 +0000 (17:49 -0700)]
fix layer updates dropping invals
bug:
5473272
Layer inval regions were being dropped, since calling setBaseLayer multiple
times in between drawGL() calls wouldn't call swapLayersTextures() on a layer
tree, and the invals in it were lost.
Change-Id: I36ebd419151613161a9a4fee858b9e97e83e61fd
Steve Block [Wed, 19 Oct 2011 15:56:27 +0000 (16:56 +0100)]
Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation
See http://trac.webkit.org/changeset/89982
Bug:
5480361
Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
The Android Open Source Project [Wed, 19 Oct 2011 14:22:59 +0000 (07:22 -0700)]
Reconcile with ics-mr0-release
Change-Id: Iaea853a76233c1f1b4c4df8dec02838f73e176fa
Kristian Monsen [Wed, 19 Oct 2011 10:44:34 +0000 (11:44 +0100)]
WebKit part of fix for bug
5307956
If the cache directory is an empty string, create an in-memory
cache instead.
Also cleared up the storage directory logic. It should only
be called once for each app now, so removed the caching and
merged the two functions.
Change-Id: Id9f179b5722425d1808f7d784d1071dee7aec6bc
The Android Automerger [Tue, 18 Oct 2011 23:54:49 +0000 (16:54 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Nicolas Roard [Tue, 18 Oct 2011 22:01:37 +0000 (15:01 -0700)]
am
8cc0fa17: Re-enable animations on the UI thread
* commit '
8cc0fa17a42ae1dec75fe8ab00d5baa75e46499e':
Re-enable animations on the UI thread
claireho [Tue, 18 Oct 2011 20:28:09 +0000 (13:28 -0700)]
Merge "Changed VerticalTextMap class to meet webkit coding style."
Nicolas Roard [Tue, 18 Oct 2011 20:07:37 +0000 (13:07 -0700)]
Re-enable animations on the UI thread
Using webkit to compute animations is still slow in some cases.
When animating large elements, we seems to sometimes bogs the GPU,
which then makes the UI takes longer to render a frame. This in turn
slow the rate at which we can call into webkit (to update the position
of the animated layers), which results in perceived stuttering.
We previously had an implementation of CSS animations that could run
fully on the UI thread, without having to call back into webkit.
We turned it off because there was still some glitches, and calling
into webkit seemed to work well enough -- but as we can see, even
if that's the case in general, edge cases still benefit from running
the animations outside of webkit.
The CL fixes the remaining glitches we had (mostly, it was the
non support of fillMode) and re-enable our CSS animations implementation.
bug:
5297559
Change-Id: I1f00bc060a76c9dfd55bd6d8ae85d5d6da68ddb5
Nicolas Roard [Tue, 18 Oct 2011 20:07:13 +0000 (13:07 -0700)]
am
a6d06cef: Be less aggressive with clippings layers tiles
* commit '
a6d06cef38891b6e39dcbc455f7692f000309ba5':
Be less aggressive with clippings layers tiles
Nicolas Roard [Tue, 18 Oct 2011 18:51:51 +0000 (11:51 -0700)]
Be less aggressive with clippings layers tiles
This also improves performances a bit when animating small layers.
bug:
5472082 bug:
5297559
Change-Id: I0b9fa0a9abf98ab53928f97f53c3134056b15889
claireho [Tue, 18 Oct 2011 00:41:52 +0000 (17:41 -0700)]
Changed VerticalTextMap class to meet webkit coding style.
Bug
5094208 : VerticalWring mode support for Books Japan.
Changed VerticalTextMap class to meet webkit coding style for
https://android-git.corp.google.com/g/#/c/141357/.
Change-Id: Ifce9968702b7ebe6d7a7da563645ec7d5e639438
The Android Open Source Project [Tue, 18 Oct 2011 14:31:54 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release
Change-Id: I21e5472086056b5ae9162cb9a6060a0cf08e96fa
Kristian Monsen [Tue, 18 Oct 2011 13:24:37 +0000 (06:24 -0700)]
Merge "Part of fix for bug
5152544 Reduce the number of warnings"
The Android Automerger [Tue, 18 Oct 2011 03:08:24 +0000 (20:08 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Chris Craik [Tue, 18 Oct 2011 00:21:21 +0000 (17:21 -0700)]
am
d76089f2: Merge "Prevent race condition in tile texture discard" into ics-mr0
* commit '
d76089f28a901fd7694a3574f0c8036febdb1103':
Prevent race condition in tile texture discard
Chris Craik [Tue, 18 Oct 2011 00:18:54 +0000 (17:18 -0700)]
Merge "Prevent race condition in tile texture discard" into ics-mr0
Chris Craik [Mon, 17 Oct 2011 23:21:52 +0000 (16:21 -0700)]
am
e8798411: Don\'t paint/allocate off screen tiles
* commit '
e87984118d573b7e6eea5547eaa43ea98bbf5447':
Don't paint/allocate off screen tiles
Chris Craik [Mon, 17 Oct 2011 19:18:09 +0000 (12:18 -0700)]
Prevent race condition in tile texture discard
bug:
5461107
Tiles were being destroyed, and subsequently dereferenced in TransferQueue
Change-Id: I4fea289e5fda03a69f07554f57120c4c5bf7b016
Chris Craik [Mon, 17 Oct 2011 21:29:04 +0000 (14:29 -0700)]
Don't paint/allocate off screen tiles
bug:
5320471
Also, reduce prefetch distance
Change-Id: I9e677c16b5d0cdc16b87bd820591088ab10ab44b
claireho [Mon, 17 Oct 2011 20:09:19 +0000 (13:09 -0700)]
Merge "Reapply CL for "Vertical Writing Mode" support."
The Android Open Source Project [Mon, 17 Oct 2011 19:20:04 +0000 (12:20 -0700)]
Reconcile with ics-mr0-release
Change-Id: I1f0f2ab5c719f9c041cb621cd5e8f102a4a25250
Ben Murdoch [Mon, 17 Oct 2011 18:37:06 +0000 (11:37 -0700)]
Merge "Fix crash in ImageBufferAndroid."
John Reck [Mon, 17 Oct 2011 18:30:54 +0000 (11:30 -0700)]
am
5dbcb79e: Merge "Fix clipping" into ics-mr0
* commit '
5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a':
Fix clipping
Chris Craik [Mon, 17 Oct 2011 18:30:37 +0000 (11:30 -0700)]
am
92738f1e: Merge "Fix layer initialization" into ics-mr0
* commit '
92738f1e982e39a6098acf39fcb5927502ec6b4c':
Fix layer initialization
Nicolas Roard [Mon, 17 Oct 2011 18:20:08 +0000 (11:20 -0700)]
resolved conflicts for merge of
7eb15a6b to master
Change-Id: Ibb8a05afcdf79923d8ba105b391fa9dcd2e9deb9
claireho [Thu, 13 Oct 2011 01:37:58 +0000 (18:37 -0700)]
Reapply CL for "Vertical Writing Mode" support.
Bug
5094208 - Browser does not handle Japanese text in vertical writing mode.
This changeset syncs up with Chrome's implementation for vertical text rendering. It
1. Adds fontOrientation and textOrientation to FontPlatformData.
2. Rotates the text in drawGlyphs for vertical writing mode.
Here are the changesets for Chrome's vertical writinig mode support:
1. http://trac.webkit.org/changeset/74232
2. http://trac.webkit.org/changeset/80610
3. http://trac.webkit.org/changeset/80654
This CL re-applies reverted CL136684(https://android-git.corp.google.com/g/#/c/136684/).
CL136684 was rollbacked because 2 constructors in FontPlatformDataAndroid.cpp
did not have the init for fontOrientation and textOrientation. That caused the
inconsistent comparison while FontCache.cpp tries to get the cached font and
falls into an infinite loop in HashTable.h:656
Change-Id: I45700dcc8c9266e1b5ae8e588205f24825ca4317
Ben Murdoch [Mon, 17 Oct 2011 12:11:00 +0000 (13:11 +0100)]
Fix crash in ImageBufferAndroid.
In the case that we do not have sufficient free
memory to create a copy of a bitmap, we must return
an Image wrapping an empty bitmap, rather than
null itself.
This handling is particular (but not exclusive) to
Android, where we cannot pass a null NativeImagePtr
like some other platforms do (as we need it to be
valid in the BitmapImage constructor).
Bug:
5409973
Change-Id: I888cf1db73a9176db2a3ea2721ca0e258d9c7773
The Android Automerger [Sat, 15 Oct 2011 04:56:53 +0000 (21:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
John Reck [Fri, 14 Oct 2011 23:18:00 +0000 (16:18 -0700)]
Merge "Don't cache size of cursor rings array"
John Reck [Fri, 14 Oct 2011 23:16:51 +0000 (16:16 -0700)]
Merge "Fix clipping" into ics-mr0
Chris Craik [Fri, 14 Oct 2011 22:39:45 +0000 (15:39 -0700)]
Merge "Fix layer initialization" into ics-mr0
Chris Craik [Fri, 14 Oct 2011 22:06:28 +0000 (15:06 -0700)]
Fix layer initialization
bug:
5452786
Fixed layer initialization to reference its current layer's SkPicture when it's
created
Change-Id: I4ac33ad6874a982d375859445e2a014ff35d7e12
Nicolas Roard [Fri, 14 Oct 2011 21:36:56 +0000 (14:36 -0700)]
Improve performances / fixes some glitches
- no layout / bgd color check if no inval on the base layer
- throttle the number of ImageTexture uploaded per draw call
- disable fast layer position update for now
bug:
5297559 bug:
5421309 bug:
5218173
Change-Id: I9ff9867dd3cfc2e0805e378d75ea75667fef8673
John Reck [Fri, 14 Oct 2011 21:04:01 +0000 (14:04 -0700)]
Don't cache size of cursor rings array
Bug:
4974452
Remove the unnecessary assert
Prevent size of cursor rings array from getting out of sync
with the cached size by eliminating the cached size
Change-Id: I40ceb22f3b636e5af890607b456e76e38c615eac
John Reck [Fri, 14 Oct 2011 20:06:55 +0000 (13:06 -0700)]
Fix clipping
Bug:
5282993
Change-Id: Ia47c420d867d3aaed8a8ea6f91285cb3b634d970
Chris Craik [Fri, 14 Oct 2011 00:04:21 +0000 (17:04 -0700)]
Double number of tile textures allocated - do not merge
bug:
5452814
Change-Id: Ib13a0f4e5189af0e4928bc376b29610e20eeb4dc
John Reck [Fri, 14 Oct 2011 17:12:16 +0000 (10:12 -0700)]
am
4520f40c: Merge "Fixup JNI" into ics-mr0
* commit '
4520f40c217eca38e19654c0d5e7c987ab07bb9a':
Fixup JNI
John Reck [Fri, 14 Oct 2011 17:10:28 +0000 (10:10 -0700)]
Merge "Fixup JNI" into ics-mr0
Steve Block [Fri, 14 Oct 2011 16:27:00 +0000 (09:27 -0700)]
am
383cc128: Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
* commit '
383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e':
Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
Steve Block [Fri, 14 Oct 2011 16:26:59 +0000 (09:26 -0700)]
am
4fb1f2dd: Cherry-pick WebKit change 89165 to fix a crash due to floats not being removed
* commit '
4fb1f2dd7e874d968a0effac0dd1e0ea8e94f46d':
Cherry-pick WebKit change 89165 to fix a crash due to floats not being removed
Steve Block [Fri, 14 Oct 2011 10:34:13 +0000 (11:34 +0100)]
Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
This is part 2 of 2 of the fix.
See http://trac.webkit.org/changeset/89836
Bug:
5249309
Change-Id: If23a41a8e75e5fb6ba9e84e481ca44a319f678ef
Steve Block [Fri, 14 Oct 2011 10:30:59 +0000 (11:30 +0100)]
Cherry-pick WebKit change 89165 to fix a crash due to floats not being removed
This is part 1 of 2 of the fix.
See http://trac.webkit.org/changeset/89165
Bug:
5249309
Change-Id: I1159aab70e1fa6d3025761423c4164682dc97b64
John Reck [Fri, 14 Oct 2011 02:24:03 +0000 (19:24 -0700)]
Fixup JNI
Bug:
5459736
Change-Id: I2125e8c0162b218f417e777d5ba62bfd314c7f60
Chris Craik [Fri, 14 Oct 2011 00:42:57 +0000 (17:42 -0700)]
am
16c97c12: (-s ours) Merge "Double number of tile textures allocated - do not merge" into ics-mr0
* commit '
16c97c12719fc27c990fc4b53f19ffd7b88f17d4':
Double number of tile textures allocated - do not merge
John Reck [Fri, 14 Oct 2011 00:41:10 +0000 (17:41 -0700)]
am
9f5d6eac: Merge "Fix navcache to work with layers for rings" into ics-mr0
* commit '
9f5d6eac13414011f6c0e5aac6a921b0bd777a95':
Fix navcache to work with layers for rings
Chris Craik [Fri, 14 Oct 2011 00:38:57 +0000 (17:38 -0700)]
Merge "Double number of tile textures allocated - do not merge" into ics-mr0
John Reck [Fri, 14 Oct 2011 00:38:26 +0000 (17:38 -0700)]
Merge "Fix navcache to work with layers for rings" into ics-mr0
John Reck [Fri, 14 Oct 2011 00:06:17 +0000 (17:06 -0700)]
Fix navcache to work with layers for rings
Bug:
5453034
Change-Id: I426aa4ca1b1c253f99c32aaf8cad597c09144af0
Chris Craik [Fri, 14 Oct 2011 00:04:21 +0000 (17:04 -0700)]
Double number of tile textures allocated - do not merge
bug:
5452814
Change-Id: Ib13a0f4e5189af0e4928bc376b29610e20eeb4dc
Chris Craik [Thu, 13 Oct 2011 22:04:15 +0000 (15:04 -0700)]
am
530c83c6: Fix crash in BaseTileTexture
* commit '
530c83c6351e05a6939ad0b5bc291da073e77b5b':
Fix crash in BaseTileTexture
Chris Craik [Thu, 13 Oct 2011 18:53:27 +0000 (11:53 -0700)]
Fix crash in BaseTileTexture
bug:
5453156
simplified m_owner management - ONLY modified on UI thread
Previously deferring clear of m_owner, now set immediately since texture thread
doesn't use need stale owner info
Change-Id: I9b6f7bfd27af44a818d378ff750c0170d8122cfd
Derek Sollenberger [Thu, 13 Oct 2011 17:15:26 +0000 (10:15 -0700)]
am
834299ee: Merge "Fix crash if a plugin is destroyed before its first drawing pass." into ics-mr0
* commit '
834299ee1971101446d6f2a422956215b6dd1c06':
Fix crash if a plugin is destroyed before its first drawing pass.
Derek Sollenberger [Thu, 13 Oct 2011 17:13:42 +0000 (10:13 -0700)]
Merge "Fix crash if a plugin is destroyed before its first drawing pass." into ics-mr0
Steve Block [Thu, 13 Oct 2011 16:36:57 +0000 (09:36 -0700)]
am
668d7ec1: Merge "Fix uses of GetByteArrayElements() in WebCoreFrameBridge" into ics-mr0
* commit '
668d7ec1b1c31b8bb2e6f45f5d2595e29a997276':
Fix uses of GetByteArrayElements() in WebCoreFrameBridge
Steve Block [Thu, 13 Oct 2011 16:35:23 +0000 (09:35 -0700)]
Merge "Fix uses of GetByteArrayElements() in WebCoreFrameBridge" into ics-mr0
Derek Sollenberger [Thu, 13 Oct 2011 15:56:32 +0000 (11:56 -0400)]
Fix crash if a plugin is destroyed before its first drawing pass.
bug:
5454889
Change-Id: I34e125d4b6aa5b9c0da7017a975e80761b6183df
Nicolas Roard [Thu, 13 Oct 2011 16:02:01 +0000 (09:02 -0700)]
am
0557c56c: Merge "Fix disappearing content" into ics-mr0
* commit '
0557c56c5b00819cf14bf29948b6d9edd1e937f2':
Fix disappearing content
Nicolas Roard [Thu, 13 Oct 2011 16:00:06 +0000 (09:00 -0700)]
Merge "Fix disappearing content" into ics-mr0
Nicolas Roard [Thu, 13 Oct 2011 15:50:12 +0000 (08:50 -0700)]
am
9bd21466: Merge "Refactor the image sharing code" into ics-mr0
* commit '
9bd214662e776fb18e43d1ad32ce274803ec309a':
Refactor the image sharing code
Nicolas Roard [Thu, 13 Oct 2011 15:47:58 +0000 (08:47 -0700)]
Merge "Refactor the image sharing code" into ics-mr0
Nicolas Roard [Thu, 13 Oct 2011 00:01:09 +0000 (17:01 -0700)]
Fix disappearing content
When we fixed the superfluous contentInvalidateAll() that was called
every time we were scrolling/zooming, this uncover some issues.
This particular one was clearing the entire pictureset when an iframe
was loaded -- this is wrong since we added support for composited
iframes, but we didn't experience this problem before because of the
contentInvalidateAll() masking it...
bug:
5449492
Change-Id: I57e4ea68daf6de901118725f5b7d70087084f23b
Nicolas Roard [Wed, 12 Oct 2011 21:34:30 +0000 (14:34 -0700)]
Merge "Revert "Support "Vertical Writing Mode".""
John Reck [Wed, 12 Oct 2011 21:08:26 +0000 (14:08 -0700)]
Revert "Support "Vertical Writing Mode"."
This reverts commit
5403113c5aa5d55a05ea001f562829e907632178
Derek Sollenberger [Wed, 12 Oct 2011 20:27:59 +0000 (13:27 -0700)]
am
5ed31e7b: Merge "Ensure the frame inversion flag is immediately effective." into ics-mr0
* commit '
5ed31e7bc52e99103e4da5755d944f9ca98305b3':
Ensure the frame inversion flag is immediately effective.
Derek Sollenberger [Wed, 12 Oct 2011 20:26:49 +0000 (13:26 -0700)]
Merge "Ensure the frame inversion flag is immediately effective." into ics-mr0
Derek Sollenberger [Wed, 12 Oct 2011 19:22:02 +0000 (15:22 -0400)]
Ensure the frame inversion flag is immediately effective.
Previously the frame inversion state was passed to the UI thread
when the layer tree was synced. This CL removes that restriction
and updates it immediately by storing the state in a cross thread
refcounted object.
bug:
5283034
Change-Id: I58a7ea0f2ed261008b945241bc783cfee4f33466
Steve Block [Wed, 12 Oct 2011 19:00:46 +0000 (12:00 -0700)]
am
4ac06026: Merge "Correctly guard WebFrame methods needed only with the Chromium HTTP stack" into ics-mr0
* commit '
4ac060268c9283c7c27657f97929fbe99712a14c':
Correctly guard WebFrame methods needed only with the Chromium HTTP stack
claireho [Wed, 12 Oct 2011 18:11:14 +0000 (11:11 -0700)]
Merge "Fallback handle if vertical glyphs are missing."
Nicolas Roard [Wed, 12 Oct 2011 01:57:52 +0000 (18:57 -0700)]
Refactor the image sharing code
We add a separate Images Manager, working
both in GL and software rendering.
bug:
5425148
Change-Id: Ib5bc88ad94d49c7f1eb969a716691ac98dc10b77
Steve Block [Wed, 12 Oct 2011 18:02:19 +0000 (11:02 -0700)]
Merge "Correctly guard WebFrame methods needed only with the Chromium HTTP stack" into ics-mr0
Steve Block [Wed, 12 Oct 2011 17:44:42 +0000 (18:44 +0100)]
Correctly guard WebFrame methods needed only with the Chromium HTTP stack
This fixes the break in builds which use the Android HTTP stack.
Change-Id: I0feb885754c34e96216c8e0c28390808f424534e
Steve Block [Wed, 12 Oct 2011 17:00:52 +0000 (10:00 -0700)]
am
d33401fd: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
* commit '
d33401fdd5a0b8f3d82389f1d7cc5168fa14a122':
Modify BrowserFrame.requestClientCert() to take the host and port as a String
Steve Block [Wed, 12 Oct 2011 16:58:20 +0000 (09:58 -0700)]
Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
Kristian Monsen [Wed, 12 Oct 2011 15:47:21 +0000 (16:47 +0100)]
Part of fix for bug
5152544 Reduce the number of warnings
The code is old, so must be some a compiler change that makes
them show up now. Initializing the rect is good anyway, and it
removes the warning.
Change-Id: If076df1250e0c9b9980db0387cd7f99ecb00dc0c
Steve Block [Wed, 12 Oct 2011 09:07:57 +0000 (10:07 +0100)]
Fix uses of GetByteArrayElements() in WebCoreFrameBridge
Currently, we call GetByteArrayElements() to get a pointer to the data, then
modify it, then fail to call ReleaseByteArrayElements. This means that if
GetByteArrayElements() happens to take a copy of the data, we'll never sync the
modified data back to the JNI object.
This change updates the code to use SetByteArrayRegion() which handles
releasing any copies that are made by JNI.
Also use ScopedLocalRef where possible.
Bug:
5442710
Change-Id: Ic8691eb18cac746ee2a2086017ffb9b5558755bd
Steve Block [Wed, 12 Oct 2011 08:53:09 +0000 (09:53 +0100)]
Modify BrowserFrame.requestClientCert() to take the host and port as a String
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.
This also fixes the fact that WebFrame::requestClientCert() fails to call
ReleaseByteArrayElements().
Requires https://android-git.corp.google.com/g/141238
in frameworks/base.
Bug:
5442710
Change-Id: If81fdef338ecdf2debeece0ebb9926bd261ae219
Chris Craik [Wed, 12 Oct 2011 00:32:51 +0000 (17:32 -0700)]
am
47f387fd: (-s ours) Merge "Revert crash on bad scale - do not merge" into ics-mr0
* commit '
47f387fdb2c9e81ee710f41b1e79f1419817801a':
Revert crash on bad scale - do not merge
Chris Craik [Wed, 12 Oct 2011 00:21:03 +0000 (17:21 -0700)]
Merge "Revert crash on bad scale - do not merge" into ics-mr0
claireho [Tue, 11 Oct 2011 20:28:10 +0000 (13:28 -0700)]
Fallback handle if vertical glyphs are missing.
Bug
5094208 : browser VerticalWritingMode support.
Some punctuation has to change its glyph in vertical writing mode.
For example, dash in vertical text is a vertical bar. In
current Android system fonts and fallback fonts, none of them have the
substitute tables for vertical writing mode. We call a conversion
function that converts the punctuation to the Unicode Vertical Form
(0xFE10 - 0xFE19) or to the closest glyphs as alternative when
vertical substitute tables are absent in fonts. Otherwise, we use
Harfbuzz to do the vertical glyph shapping.
Change-Id: If1d31bb72aaaba45ed50bbb75d6246cfa30e3428
Chris Craik [Tue, 11 Oct 2011 23:10:50 +0000 (16:10 -0700)]
Revert crash on bad scale - do not merge
bug:
5367327
Change-Id: I94589e007f9669fa1b43ab5cee42bfa44d9e503c