summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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
* | | | | | am 4520f40c: Merge "Fixup JNI" into ics-mr0John Reck2011-10-141-15/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '4520f40c217eca38e19654c0d5e7c987ab07bb9a': Fixup JNI
| * | | | | Merge "Fixup JNI" into ics-mr0John Reck2011-10-141-15/+16
| |\ \ \ \ \
| | * | | | | Fixup JNIJohn Reck2011-10-131-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5459736 Change-Id: I2125e8c0162b218f417e777d5ba62bfd314c7f60
* | | | | | | am 383cc128: Cherry-pick WebKit change 89836 to fix a crash due to floats ↵Steve Block2011-10-141-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not being removed * commit '383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e': Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
| * | | | | | Cherry-pick WebKit change 89836 to fix a crash due to floats not being removedSteve Block2011-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of 2 of the fix. See http://trac.webkit.org/changeset/89836 Bug: 5249309 Change-Id: If23a41a8e75e5fb6ba9e84e481ca44a319f678ef
* | | | | | | am 4fb1f2dd: Cherry-pick WebKit change 89165 to fix a crash due to floats ↵Steve Block2011-10-142-4/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not being removed * commit '4fb1f2dd7e874d968a0effac0dd1e0ea8e94f46d': Cherry-pick WebKit change 89165 to fix a crash due to floats not being removed
| * | | | | | Cherry-pick WebKit change 89165 to fix a crash due to floats not being removedSteve Block2011-10-142-4/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 1 of 2 of the fix. See http://trac.webkit.org/changeset/89165 Bug: 5249309 Change-Id: I1159aab70e1fa6d3025761423c4164682dc97b64
| * | | | | Merge "Double number of tile textures allocated - do not merge" into ics-mr0Chris Craik2011-10-132-2/+4
| |\ \ \ \ \
| | * | | | | Double number of tile textures allocated - do not mergeChris Craik2011-10-132-2/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | bug:5452814 Change-Id: Ib13a0f4e5189af0e4928bc376b29610e20eeb4dc
* | | | | | am 9f5d6eac: Merge "Fix navcache to work with layers for rings" into ics-mr0John Reck2011-10-132-21/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9f5d6eac13414011f6c0e5aac6a921b0bd777a95': Fix navcache to work with layers for rings
| * | | | | Merge "Fix navcache to work with layers for rings" into ics-mr0John Reck2011-10-132-21/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix navcache to work with layers for ringsJohn Reck2011-10-132-21/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5453034 Change-Id: I426aa4ca1b1c253f99c32aaf8cad597c09144af0
* | | | | | am 530c83c6: Fix crash in BaseTileTextureChris Craik2011-10-135-33/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '530c83c6351e05a6939ad0b5bc291da073e77b5b': Fix crash in BaseTileTexture
| * | | | | Fix crash in BaseTileTextureChris Craik2011-10-135-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 834299ee: Merge "Fix crash if a plugin is destroyed before its first ↵Derek Sollenberger2011-10-131-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawing pass." into ics-mr0 * commit '834299ee1971101446d6f2a422956215b6dd1c06': Fix crash if a plugin is destroyed before its first drawing pass.
| * | | | | Merge "Fix crash if a plugin is destroyed before its first drawing pass." ↵Derek Sollenberger2011-10-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | Fix crash if a plugin is destroyed before its first drawing pass.Derek Sollenberger2011-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5454889 Change-Id: I34e125d4b6aa5b9c0da7017a975e80761b6183df
* | | | | | | am 668d7ec1: Merge "Fix uses of GetByteArrayElements() in ↵Steve Block2011-10-131-18/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCoreFrameBridge" into ics-mr0 * commit '668d7ec1b1c31b8bb2e6f45f5d2595e29a997276': Fix uses of GetByteArrayElements() in WebCoreFrameBridge
| * | | | | | Merge "Fix uses of GetByteArrayElements() in WebCoreFrameBridge" into ics-mr0Steve Block2011-10-131-18/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix uses of GetByteArrayElements() in WebCoreFrameBridgeSteve Block2011-10-121-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 0557c56c: Merge "Fix disappearing content" into ics-mr0Nicolas Roard2011-10-131-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0557c56c5b00819cf14bf29948b6d9edd1e937f2': Fix disappearing content
| * | | | | | Merge "Fix disappearing content" into ics-mr0Nicolas Roard2011-10-131-0/+9
| |\ \ \ \ \ \
| | * | | | | | Fix disappearing contentNicolas Roard2011-10-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 9bd21466: Merge "Refactor the image sharing code" into ics-mr0Nicolas Roard2011-10-1311-69/+209
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | * commit '9bd214662e776fb18e43d1ad32ce274803ec309a': Refactor the image sharing code
| * | | | | | Merge "Refactor the image sharing code" into ics-mr0Nicolas Roard2011-10-1311-69/+209
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
generated by cgit v1.1 at 2024-09-14 10:28:32 +0000