summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't force composited layers to be stacking contextsChris Craik2011-10-211-1/+1
| | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* am 458b4b11: Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
|\ | | | | | | | | * commit '458b4b11924c3bcc70dcdd3d69f64a855870e72d': Mark tiles dirty, even if repainting
| * Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded ↵Steve Block2011-10-201-1/+1
|\ \ | | | | | | | | | from the cache on back navigation"
| * | Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the ↵Steve Block2011-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | cache on back navigation See http://trac.webkit.org/changeset/89982 Bug: 5480361 Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-200-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I631833f425688ec28b521cf0c7ac05f5575b0997
| * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| | |\ \
* | | \ \ am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ↵John Reck2011-10-191-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit '94cabcbdc194d4a28d31cfb82be98a287b8cf1c9': Force a navcache update before requesting keyboard
| * | | | Merge "Force a navcache update before requesting keyboard" into ics-mr0John Reck2011-10-191-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Force a navcache update before requesting keyboardJohn Reck2011-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5453541 Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b
* | | | | am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" ↵Chris Craik2011-10-191-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '81fab713750af480b451fbd9926b7d76b7017551': Mark tiles dirty when discarded from transfer queue
| * | | | Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0Chris Craik2011-10-191-1/+6
| |\ \ \ \
| | * | | | Mark tiles dirty when discarded from transfer queueChris Craik2011-10-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5409902 Tiles weren't always marked dirty, and could get out of the transfer queue without being marked dirty. Change-Id: Ia0fe71f00f61d7aede8ca7bc4a389ac417906d36
* | | | | | am 1fa411c7: fix layer updates dropping invalsChris Craik2011-10-192-52/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit '1fa411c75dc305a99ec524101550a7f297402362': fix layer updates dropping invals
| * | | | fix layer updates dropping invalsChris Craik2011-10-192-52/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-190-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Iaea853a76233c1f1b4c4df8dec02838f73e176fa
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-180-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 8cc0fa17: Re-enable animations on the UI threadNicolas Roard2011-10-184-76/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8cc0fa17a42ae1dec75fe8ab00d5baa75e46499e': Re-enable animations on the UI thread
| * | | Re-enable animations on the UI threadNicolas Roard2011-10-184-76/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Changed VerticalTextMap class to meet webkit coding style."claireho2011-10-183-21/+16
|\ \ \ \
| * | | | Changed VerticalTextMap class to meet webkit coding style.claireho2011-10-183-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am a6d06cef: Be less aggressive with clippings layers tilesNicolas Roard2011-10-181-0/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'a6d06cef38891b6e39dcbc455f7692f000309ba5': Be less aggressive with clippings layers tiles
| * | | | Be less aggressive with clippings layers tilesNicolas Roard2011-10-181-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This also improves performances a bit when animating small layers. bug:5472082 bug:5297559 Change-Id: I0b9fa0a9abf98ab53928f97f53c3134056b15889
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-180-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I21e5472086056b5ae9162cb9a6060a0cf08e96fa
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-170-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | Merge "Part of fix for bug 5152544 Reduce the number of warnings"Kristian Monsen2011-10-181-1/+1
|\ \ \ \
| * | | | Part of fix for bug 5152544 Reduce the number of warningsKristian Monsen2011-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am d76089f2: Merge "Prevent race condition in tile texture discard" into ics-mr0Chris Craik2011-10-175-16/+24
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'd76089f28a901fd7694a3574f0c8036febdb1103': Prevent race condition in tile texture discard
| * | | | Merge "Prevent race condition in tile texture discard" into ics-mr0Chris Craik2011-10-175-16/+24
| |\ \ \ \
| | * | | | Prevent race condition in tile texture discardChris Craik2011-10-175-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5461107 Tiles were being destroyed, and subsequently dereferenced in TransferQueue Change-Id: I4fea289e5fda03a69f07554f57120c4c5bf7b016
* | | | | | am e8798411: Don\'t paint/allocate off screen tilesChris Craik2011-10-172-8/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit 'e87984118d573b7e6eea5547eaa43ea98bbf5447': Don't paint/allocate off screen tiles
| * | | | Don't paint/allocate off screen tilesChris Craik2011-10-172-8/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5320471 Also, reduce prefetch distance Change-Id: I9e677c16b5d0cdc16b87bd820591088ab10ab44b
* | | | Merge "Reapply CL for "Vertical Writing Mode" support."claireho2011-10-176-18/+64
|\ \ \ \
| * | | | Reapply CL for "Vertical Writing Mode" support.claireho2011-10-176-18/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-170-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I1f0f2ab5c719f9c041cb621cd5e8f102a4a25250
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-140-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Double number of tile textures allocated - do not mergeChris Craik2011-10-142-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5452814 Change-Id: Ib13a0f4e5189af0e4928bc376b29610e20eeb4dc
* | | | | Merge "Fix crash in ImageBufferAndroid."Ben Murdoch2011-10-171-4/+2
|\ \ \ \ \
| * | | | | Fix crash in ImageBufferAndroid.Ben Murdoch2011-10-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 5dbcb79e: Merge "Fix clipping" into ics-mr0John Reck2011-10-171-9/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '5dbcb79ed2d4e7a3b7ebdf43b7e0048205d5da1a': Fix clipping
| * | | | | Merge "Fix clipping" into ics-mr0John Reck2011-10-141-9/+3
| |\ \ \ \ \
| | * | | | | Fix clippingJohn Reck2011-10-141-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5282993 Change-Id: Ia47c420d867d3aaed8a8ea6f91285cb3b634d970
* | | | | | | am 92738f1e: Merge "Fix layer initialization" into ics-mr0Chris Craik2011-10-172-13/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '92738f1e982e39a6098acf39fcb5927502ec6b4c': Fix layer initialization
| * | | | | | Merge "Fix layer initialization" into ics-mr0Chris Craik2011-10-142-13/+17
| |\ \ \ \ \ \
| | * | | | | | Fix layer initializationChris Craik2011-10-142-13/+17
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5452786 Fixed layer initialization to reference its current layer's SkPicture when it's created Change-Id: I4ac33ad6874a982d375859445e2a014ff35d7e12
* | | | | | | resolved conflicts for merge of 7eb15a6b to masterNicolas Roard2011-10-178-10/+58
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | Change-Id: Ibb8a05afcdf79923d8ba105b391fa9dcd2e9deb9
| * | | | | Improve performances / fixes some glitchesNicolas Roard2011-10-148-10/+58
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | Merge "Don't cache size of cursor rings array"John Reck2011-10-143-13/+8
|\ \ \ \ \
| * | | | | Don't cache size of cursor rings arrayJohn Reck2011-10-143-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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