summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Crash on Orange media portal"John Reck2012-08-311-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Crash on Orange media portalAnders Edenbrandt2012-08-311-0/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visit orange.deezer.com, press tab marked "My Music". Browser crashes every time. Pressing the button will trigger a re-layout of the page. This in turn will cause some rendering nodes of type RenderLayer to be removed from the rendering tree. When such a node is removed, it is important to also update certain lists in ancestor nodes that may hold references to this node. A node that may hold such a reference is identified as being a "stacking context". However, in Android, when the symbol ENABLE_COMPOSITED_FIXED_ELEMENTS is defined, the definition of what is a stacking context is expanded. In this case, a node that is a stacking context and holds references to descendants, changes one of the conditions that form part of Android's expanded stacking context definition. So, now it is no longer a stacking context, but the reference list is not deleted/updated. When the descendant node is removed a search for an ancestral stacking context is made, but it will not find this node since it is no longer a stacking context. The solution is to make sure that the list of references is updated/cleared whenever the node changes a condition that may cause its status as a stacking context to also change. Change-Id: If5a7b63715020bc3d23749a7c09003a86d90e28d
* | | | | | | | | | | | | | | | | | | | | | | | am 76150b63: am 5423878e: Merge "Enable dynamic effect of GIF animating ↵Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | images in browser" * commit '76150b639b267a6f89506ad9b75c7eae5e2b60c2': Enable dynamic effect of GIF animating images in browser
| * | | | | | | | | | | | | | | | | | | | | | | am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5423878ee1cb0965ced62800f36933841eaa40f6': Enable dynamic effect of GIF animating images in browser
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Enable dynamic effect of GIF animating images in browserbxu10X2012-08-301-0/+4
| | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ANDROID_LARGE_MEMORY_DEVICE flag is not set for x86 platforms but it is required to get animated GIF working. 256MB is considered "large". Change-Id: Ic0158e1bff44cbed0f4301f99104c1b5ac0e9c59 Author: Bin Xu <bxu10X@intel.com> Signed-off-by: Bin Xu <bxu10X@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 19205
* | | | | | | | | | | | | | | | | | | | | | | | am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | * commit '88c8b22657f6cfd1269219430aa31c5ecb03faba': webkit: enable no-pic compiling option
| * | | | | | | | | | | | | | | | | | | | | | am 9b636ce4: Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b636ce4cb6c82baac597c70089627231fccb300': webkit: enable no-pic compiling option
| | * | | | | | | | | | | | | | | | | | | | | Merge "webkit: enable no-pic compiling option"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | webkit: enable no-pic compiling optionbxu10X2012-08-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to enable no-pic compiling option PIC enables efficient code sharing between processes but increases overhead due to indirectly access global variables and functions. By enabling no-pic here, we can get rid of indirect access calling __x86.get_pc_thunk.bx, while still share the library between processes, since zygote loads libwebcore, and all android applications are forked from zygote and inherits its address space. The patch takes effect together with the one enabling no-pic compiling option in v8. With them, we can see obvious performance improvement for browser workloads, 5%+ for HTML5-zoom and HTML5-animation, 6.6% for sunspider, and 9.1% for pageloading Note: This patch is related to a change in platform/external/v8 Change-Id: I47ee3149d31b2f7d78c4a399503b6d9a9f0f572a Author: Lijuan Xiao<lijuan.xiao@intel.com> Signed-off-by: Bin Xu <bxu10X@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 26358
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Provide referer when download requested" into jb-mr1-devSelim Gurun2012-08-295-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Provide referer when download requestedSelim Gurun2012-08-295-5/+16
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6662557 Provide the plumbing for passing referer for downloads. Change-Id: Ia4af34632be5e5df44b7d19501db1b589c45cddf
* | | | | | | | | | | | | | | | | | | | | | | am f2b8b88d: am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | * commit 'f2b8b88d1a8fefaf6de6c6bce24ae092abdf9584': Fix memory leak caused by CSSRuleList wrapper
| * | | | | | | | | | | | | | | | | | | | | am 51619153: Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5161915319ca55318d2ef68a84b735f01c3d202f': Fix memory leak caused by CSSRuleList wrapper
| | * | | | | | | | | | | | | | | | | | | | Merge "Fix memory leak caused by CSSRuleList wrapper"Jean-Baptiste Queru2012-08-2816-38/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Fix memory leak caused by CSSRuleList wrapperxqian62012-08-2416-38/+50
| | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing cssrulelist in javascript will create a new CSSRuleList object and wrapper JS object. The wrapper JS object will be added into hidden array in parent JS object which is alive during the whole execution. Thus memory leak happens (CSSRuleList in webkit, wrapper object and weak global handle in v8). Cherry pick 2 patches from upstream solves the problem: http://trac.webkit.org/changeset/90949 This patch changes hidden reference from array to named property. So new wrapper will replace old wrappper. But the memory leak still exists because the CSSRuleList wrapper will be added into an object group of current document. So they will still be alive during execution. http://trac.webkit.org/changeset/91256 This patch avoids to adding CSSRuleList wrapper into document object group. Combined with the first patch, it can resolve the memory leak problem. Change-Id: Icb523db52963726f27b6c02596822cfb6e8d5049 Author: Vitaly Repeshko <vitalyr@chromium.org> Signed-off-by: Xi Qian <xi.qian@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 32630
* | | | | | | | | | | | | | | | | | | | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use new surface flinger API.Jeff Brown2012-08-241-2/+9
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I807620f965779274e36aac6729dc1e6374ff8716
* | | | | | | | | | | | | | | | | | | | | | Merge "Text around selection falls back to caret rect when not in text." ↵George Mount2012-08-272-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | | | | | | | | | | | | Text around selection falls back to caret rect when not in text.George Mount2012-08-232-4/+5
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7025068 When the input field is empty, the selection was appearing outside the input field. With this change, we fall back to the caret rect for the text around the caret. Change-Id: Ie6122ec34a0ae96994dc91b002bdcb3403b753eb
* | | | | | | | | | | | | | | | | | | | | | Don't track the opaque area of small drawing operationsChris Craik2012-08-241-1/+4
| |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids region & matrix computation work for small ops. Area value of 750 determined empirically. Change-Id: Iffc041ff69cd47c152ae4f71a474f4f6ccdc0bc5
* | | | | | | | | | | | | | | | | | | | | Only use the clipping painter when painting to a bitmap.Chris Craik2012-08-231-18/+24
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6389297 This improves performance in capturePicture, since it avoids all of the clipping and opaque region tracking logic. Change-Id: If1db553b2568573f94cdee7b801c67be0c47c056
* | | | | | | | | | | | | | | | | | | | Merge "Exit fast tile swap mode immediately upon SurfaceCollection swap" ↵Chris Craik2012-08-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | | | | | | | | | | Exit fast tile swap mode immediately upon SurfaceCollection swapChris Craik2012-08-201-0/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7002755 This prevents the SurfaceCollectionManager from getting stuck in fast swap mode, where because swaps are occuring in process mode, and not in draw mode, which would previously have prevented the flag from being cleared. Change-Id: Ie888438c73aabeeff0534caad68b58e4acd2c440
* | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Text locale compatibility shim" into jb-mr1-devVictoria Lease2012-08-203-91/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE Text locale compatibility shimBilly Hewlett2012-08-203-91/+142
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick I2a69f2834ca50c37302dcd4816edb630b1208a41 from master. This change allows WebView to continue to function as before, displaying text using the system default fallback font chain. Change-Id: Ibcb8924d270cc602295158684bd700cfcbb1ec46
* | | | | | | | | | | | | | | | | | | | Fix opaque operation area calculationChris Craik2012-08-202-18/+25
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7003352 Correctly handle state pushing/manipulation, shaders, and transfer mode. Change-Id: I9f6591711b15ff99a182fc9956f7ef389320e9c3
* | | | | | | | | | | | | | | | | | | Merge "Support partial invals on layers" into jb-mr1-devJohn Reck2012-08-174-59/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Support partial invals on layersJohn Reck2012-08-174-59/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab18e8b5e2f0e37c380c8a15e51255121c3b1966
* | | | | | | | | | | | | | | | | | | | Merge "Early return from layer painting when fully clipped" into jb-mr1-devChris Craik2012-08-171-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Early return from layer painting when fully clippedChris Craik2012-08-161-7/+8
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes logspam due to merged layers unnecessarily painting when fully clipped. Change-Id: I0f2f1b851c9386dcebda58bf844fd68073338e1c
* | | | | | | | | | | | | | | | | | | am e750fbf4: am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato2012-08-171-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e750fbf445a3f34de7089c8efe7ac442cacd5781': host modules don't need LOCAL_MODULE_TAGS
| * | | | | | | | | | | | | | | | | | am b74a9cf2: Merge "host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato2012-08-161-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b74a9cf2d2d336bcc08271d254cf4d725b4f3c96': host modules don't need LOCAL_MODULE_TAGS
| | * | | | | | | | | | | | | | | | | Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato2012-08-161-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-151-2/+0
| | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52f9c80418f9960e463664096f98bcbcf79ecc6b
* | | | | | | | | | | | | | | | | | Merge "Fix SIGBUG due to misalignment" into jb-mr1-devJohn Reck2012-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix SIGBUG due to misalignmentJohn Reck2012-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7003956 Don't pack data Change-Id: I659a8b4cbf47ece9af16532949466f3fe2f6e61b
* | | | | | | | | | | | | | | | | | | am f314e0fc: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / * commit 'f314e0fce62e1a05da89c8443e04eb8cc05ba1b0':
| * | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia94bafdd3676dd3627c9f108f45621b6ed1ace65
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Increase max texture count to accommodate large screens" into jb-mr1-devChris Craik2012-08-161-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Increase max texture count to accommodate large screensChris Craik2012-08-161-5/+5
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6968485 Change-Id: I8691d34fc5d4da1d03f31fd45c2d6d6abc39c53b
* | | | | | | | | | | | | | | | | | | Merge "Memory allocation changes" into jb-mr1-devJohn Reck2012-08-166-80/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Memory allocation changesJohn Reck2012-08-166-80/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RecordingData to LinearAllocator Consolidate 4 heaps into 1 Minimize initial RAM usage Add page size growth Change-Id: I997ee6d88d0ae500ed85b9d20e6ed095069f2b04
* | | | | | | | | | | | | | | | | | | Merge "Correctly handle preserve-3d layer ordering" into jb-mr1-devChris Craik2012-08-154-47/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correctly handle preserve-3d layer orderingChris Craik2012-08-154-47/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6843244 Current implementation only works for HW acceleration. Change-Id: I009090132a8f3859ab9e57e609c1754f9021d4d7
* | | | | | | | | | | | | | | | | | | Merge "Use content size for scroll width calculation." into jb-mr1-devGeorge Mount2012-08-151-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use content size for scroll width calculation.George Mount2012-08-141-1/+4
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6976140 Horizontal scrolling calculation requires use of content and not client width. Vertical scrolling uses client width because text areas support padding differently than text inputs. Change-Id: Ib105c6c185415c1784c83f7203810a3e5416a9c8
* | | | | | | | | | | | | | | | | | Move text allocations to LinearAllocatorJohn Reck2012-08-143-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ef492679e94bdb452033ee3af3162b88d323d57
* | | | | | | | | | | | | | | | | | Memory usage improvementsJohn Reck2012-08-142-10/+49
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Share SkPaints between drawPosText calls Change-Id: Idf25c937a70e2969a864c829e566688b977720c0