summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0814-39/+39
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I4de9cd9a3bc462c4aead1fbcd4ac0f426556bc59
* Merge "When loading progress is running, ask for redraw"Teng-Hui Zhu2012-01-061-0/+1
|\
| * When loading progress is running, ask for redrawTeng-Hui Zhu2012-01-061-0/+1
| | | | | | | | | | | | | | This can smooth the animation of the loading progress. Otherwise, loading progress can look choppy. Change-Id: I05c2b70f7172e9a05edce7610675719b830949dd
* | Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."George Mount2012-01-061-189/+223
|\ \
| * | Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.George Mount2012-01-051-189/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5827817 Added a nativeClass parameter to all appropriate JNI methods and used it instead of GET_NATIVE_VIEW to reduce JNI overhead. Framework Change: I49c7ecfd Change-Id: I02004fe10a6513d46a51ba4c630d47499d954223
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-063-9/+9
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: Ia6cf33690679476e7d39c63fa59505491217fdde
* | | Merge "Fix off-by-border RTL initial scrolling."George Mount2012-01-051-3/+2
|\ \ \
| * | | Fix off-by-border RTL initial scrolling.George Mount2011-12-201-3/+2
| |/ / | | | | | | | | | | | | | | | Bug 5774511 Change-Id: I8bfbc07750a129916ee804d6e1cfc1eb11288dc0
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-051-1/+1
|\ \ \
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I46d68746801019310494afde8769e5cc908bc835
* | | | am f6eccb79: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | * commit 'f6eccb799100e9b8b94bd9e9e33b8a30e63b32f8':
| * \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ie2281e8fe54d8934b4caab74b6040bb786bb3af6
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 00efa06c: (-s ours) am f62e398f: Merge "Enable History API. Do not ↵Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge." into ics-mr1 * commit '00efa06c5dfaed2d9054aaf9cd5c048a80d4b148': Enable History API. Do not merge.
| * | | | | | am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f62e398f3b87d76e44d18441fa090c18dcc8be82': Enable History API. Do not merge.
| | * | | | | Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| | |\ \ \ \ \
| | | * | | | | Enable History API. Do not merge.Ben Murdoch2012-01-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3 The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ib7374e0145c581588990baec6e67025c1b7ef693
* | | | | | | | am 0d647bc2: (-s ours) am d13df54b: Merge "Fix crash with composited layers ↵Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" into ics-mr1 * commit '0d647bc28cc93eef51ec61acd0bb6e445eb2c276': Fix crash with composited layers - DO NOT MERGE
| * | | | | | | am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ↵Bart Sears2012-01-043-4/+51
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'd13df54b67ff2373e79cf6c70bd2369e556ec9c0': Fix crash with composited layers - DO NOT MERGE
| | * | | | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1Bart Sears2012-01-043-4/+51
| | |\ \ \ \ \ \
| | | * | | | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-033-4/+51
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick from master When we have composited layers inside iframes/frames, the layers hierarchy is not always up to date at the time of the layerSync() call. If some of those layers are scheduled to be repainted, the repaint operation will triggers the update of the composited layers tree -- possibly resulting in the deallocation of the very same GraphicsLayer we were painting from, and thus leading to a crash. The fix consist in gathering all the root RenderLayer (for each frame containing composited layers) and explicitely asking RenderLayerCompositor to check if the composited tree needs to be updated, before we traverse the tree to paint the elements. bug:5695185 Change-Id: I33a00b847eb19c9aa4b68f0ac3adbe36709ed00b
* | | | | | | | am 9a4df506: (-s ours) am 08a2aede: Merge "When in singlesurfacemode, resist ↵Chris Craik2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching out - DO NOT MERGE" into ics-mr1 * commit '9a4df506f5f02fbd4cca2cde580324c45a0b56f5': When in singlesurfacemode, resist switching out - DO NOT MERGE
| * | | | | | | am 08a2aede: Merge "When in singlesurfacemode, resist switching out - DO NOT ↵Chris Craik2012-01-041-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into ics-mr1 * commit '08a2aede30839b296a2fad9d27939c4aaa6ccbb1': When in singlesurfacemode, resist switching out - DO NOT MERGE
| | * | | | | | Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into ↵Chris Craik2012-01-041-0/+7
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1
| | | * | | | | | When in singlesurfacemode, resist switching out - DO NOT MERGEChris Craik2012-01-041-0/+7
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of https://android-git.corp.google.com/g/#/c/155078/ into MR1 branch bug:5660814 We want to avoid swapping in and out of singlesurface mode when we have enough textures to hold the content, but not while the content is updating. Change-Id: I3c45f2b9f3c8e06b397b701fb53ac6ac5ff8efdd
* | | | | | | | am acd6e277: (-s ours) am 2cc4497f: Merge "When loading new content, reset ↵Chris Craik2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zoom state - DO NOT MERGE" into ics-mr1 * commit 'acd6e2772da194e45555acd3c5792246c91a15f5': When loading new content, reset zoom state - DO NOT MERGE
| * | | | | | | am 2cc4497f: Merge "When loading new content, reset zoom state - DO NOT ↵Chris Craik2012-01-041-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into ics-mr1 * commit '2cc4497f17622689c7cd981e220795762660df5c': When loading new content, reset zoom state - DO NOT MERGE
| | * | | | | | Merge "When loading new content, reset zoom state - DO NOT MERGE" into ics-mr1Chris Craik2012-01-041-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | When loading new content, reset zoom state - DO NOT MERGEChris Craik2012-01-041-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of https://android-git.corp.google.com/g/#/c/155121/2 into MR1 branch bug:5757950 Change-Id: I34042e8b1f1adf1fc1826d7fde5500708bef3b60
* | | | | | | | am e5b68556: am 41aebb2b: Return the tile generation thread to default priority.Chris Craik2012-01-041-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5b6855637cefa440231d37a2dc4326bebe9833e': Return the tile generation thread to default priority.
| * | | | | | | am 41aebb2b: Return the tile generation thread to default priority.Chris Craik2012-01-041-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '41aebb2b842adadd00ec4d6682160e05d4e24f63': Return the tile generation thread to default priority.
| | * | | | | | Return the tile generation thread to default priority.Chris Craik2012-01-031-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this partial revert of ececd484e5832707be4a73b70da37f862eb14c35 , single core devices can't have tile generation starved by javascript/plugins. bug:5746432 Change-Id: I42b5799f4ba136e1c6f9812219824d21390bace2
* | | | | | | Merge "Rewrote validZip() with three-digit ZIP prefix."Victoria Lease2012-01-041-74/+178
|\ \ \ \ \ \ \
| * | | | | | | Rewrote validZip() with three-digit ZIP prefix.Victoria Lease2012-01-041-74/+178
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5774164 The previous version of validZip() used a single two-digit ZIP prefix range with two exceptions, per state. This did not accurately reflect postal reality, so I've modified the function to use a proper three-digit ZIP prefix. This should address the ZIP/state mismatches present in the previous implementation, including Montana addresses failing detection. Change-Id: Ia0dada335ff2972e9649308751e60b71799e75ac
* | | | | | | Merge "Allow 0 pt fonts in SkPaint."Derek Sollenberger2012-01-041-5/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Allow 0 pt fonts in SkPaint.Derek Sollenberger2012-01-041-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a companion change in external/skia. bug: 5800195 Change-Id: I5af3743b0dbda8ffcf09dfb09416170e90053d31
* | | | | | | Merge "Remove unnecessary gl texture wrap setting"Teng-Hui Zhu2012-01-041-2/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove unnecessary gl texture wrap settingTeng-Hui Zhu2012-01-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I232614356be965331cefe086f4c3c44f44b7c1a7
* | | | | | | Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"Steve Block2012-01-0418-79/+79
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0318-79/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I35a9fa5e53a83a9c9a920333a3752dd151fbd3b8
* | | | | | | Merge "Employ the transfer queue to the pure color tiles"Teng-Hui Zhu2012-01-049-80/+132
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Employ the transfer queue to the pure color tilesTeng-Hui Zhu2012-01-039-80/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed the sync problem for the pure color tiles. When Tex Gen thread detect that the tile is pure color, UI need to pick it up in the right time. To avoid adding too many sync object, the simplest way is following the same idea of transfer queue. At the same time, using a separate queue and adding simple operation on top of it can limit the impact to the original transfer queue which is highly coupled with SurfTex implemenation. bug:5808996 Change-Id: I518d358c5626815b27f285d4dcadcee9c3234835
* | | | | | | Fix AppCache when either no path or an invalid path is suppliedSteve Block2012-01-041-10/+26
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only enable AppCache when it's been enabled with a call to WebSetting.setAppCacheEnabled() and if a valid path has been supplied to WebSetting.setAppCachePath(). Requires a corresponding change to frameworks/base: https://android-git.corp.google.com/g/155450 Bug: 5745181 Change-Id: I08d0016e19c436edef725f6ad2513bd369fda7b9
* | | | | | Merge "Change VerticalTextMap.cpp for VerticalWritingMode after fallback ↵claireho2012-01-031-16/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | font update. Bug 5472953 : Need glyphs for Vertical Text Form"
| * | | | | | Change VerticalTextMap.cpp for VerticalWritingMode after fallback font update.claireho2011-12-191-16/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5472953 : Need glyphs for Vertical Text Form 1. Enable some mappings after new fallback font(https://android-git.corp.google.com/g/#/c/155813/). 2. Add more mappings for converting punctuations to their vertical forms. 3. Error corrections for 0x002d, 0x003b and 0x3019. Change-Id: I63f2c58af1d7bf6c8b9f5bd93c7a0d9f9f70f691
* | | | | | Merge "Enable History API."Ben Murdoch2012-01-031-0/+7
|\ \ \ \ \ \
| * | | | | | Enable History API.Ben Murdoch2011-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3
* | | | | | | Merge "Clean up the internal interface for draw call"Teng-Hui Zhu2011-12-293-264/+233
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Clean up the internal interface for draw callTeng-Hui Zhu2011-12-293-264/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group all the uniform location (handle) together by types. This can help to simplify the interface. There should be no functionality change here. Change-Id: I10d4e5f0157e775109fd8daed5a88eae967b506f
* | | | | | | Merge "Use the shader to draw a tile with single color."Teng-Hui Zhu2011-12-227-47/+251
|\ \ \ \ \ \ \ | |/ / / / / /
generated by cgit v1.1 at 2025-10-26 09:27:28 +0000