summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
| |\ \ \ \
| | * | | | Mark layers as ready to swap if invisibleChris Craik2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b
* | | | | | Merge "Fix SW extras for layers"John Reck2011-10-2414-107/+17
|\ \ \ \ \ \
| * | | | | | Fix SW extras for layersJohn Reck2011-10-2414-107/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507239 Also remove all the old, unused layer setExtras stuff Change-Id: I6b319192fac4c8ce0995bc7883f64fc482beff05
* | | | | | | am d436d4c3: Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'd436d4c3e6b088f1fcae26dc4835e28065f017a8': Remove unnecessary log
| * | | | | Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove unnecessary logNicolas Roard2011-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug log that we don't need, spamming logcat Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c
* | | | | | Merge "Don't force composited layers to be stacking contexts"Chris Craik2011-10-241-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '5dee9ed228c914254062b62ae459884e3060a2ae': Cherry pick 97075
| * | | | | Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
| |\ \ \ \ \
| | * | | | | Cherry pick 97075John Reck2011-10-204-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5491444 Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
* | | | | | | am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | * commit '5236e6a2f70997cf9dec9e93261867dd79b21738': Cherry pick 94857
| * | | | | Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Cherry pick 94857John Reck2011-10-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5491573 Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859
* | | | | Merge "WebKit part of fix for bug 5307956"Kristian Monsen2011-10-211-21/+18
|\ \ \ \ \
| * | | | | WebKit part of fix for bug 5307956Kristian Monsen2011-10-191-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 6032fa42: Merge "Implement dual textures for layers to handle zooming ↵Nicolas Roard2011-10-208-41/+175
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | correctly." into ics-mr0 * commit '6032fa428d725097ea29fc85fc1b2c965094772b': Implement dual textures for layers to handle zooming correctly.
| * | | | Merge "Implement dual textures for layers to handle zooming correctly." into ↵Nicolas Roard2011-10-208-41/+175
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ics-mr0
| | * | | | Implement dual textures for layers to handle zooming correctly.Nicolas Roard2011-10-208-41/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add a new class, DualTiledTexture, that encapsulate two TiledTextures and manage them according to the current scale factor. bug:5492874 Change-Id: I4ba3ff539f9242ae5102189e9623e1535e9cc28f
* | | | | | 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
* | | | 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
* | | 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
* | | 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
* | | | 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