summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove inconsistency between HistoryItem writing/readingYaroslav Miroshnychenko2012-09-031-4/+7
| | | | | | | | | | | | Fixes inconsistent writing of HistoryItem formData for the case when formData is not null, but it gets flattened and saved as empty string. FormData identifier also gets written in that case, which creates problem on HistoryItem reading, when parser does not expect to meet form identifier after it reads zero as FormData size. Change-Id: I77cf00b5b2a0f2a7cf4355d1bc1b8d4830ac1afb
* 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
* 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
* 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 "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 "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 browser rendering issue: pure color tiles are rendered black"John Reck2012-08-021-1/+1
|\
| * Fix browser rendering issue: pure color tiles are rendered blackYuyang Du2012-08-011-1/+1
|/ | | | | | | | | | | | | | | | The “pure color tile” optimization finds the pure-color tiles and then draws the tiles simply with the color (otherwise the texture). But the RGBA color pointer type is char, which may overflow when the value is larger than 127. In such case, the tiles in question are rendered black, because of the wrong color. This bug is fixed by defining the pointer as unsigned char. Change-Id: I5c7214423fa6961e707bde72f0e18c610374745d Author: Yuyang Du <yuyang.du@intel.com> Signed-off-by: Yuyang Du <yuyang.du@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
|\ | | | | | | Change-Id: I4bc0b90d3078b9eaebe8fc08eda767767dc68dd9
| * Reconcile AOSP master and JellyBeanJean-Baptiste Queru2012-06-260-0/+0
| |\ | |/ |/| | | Change-Id: I7c9f8c596ec815bc110922acccbb346aa7cbb2bf
* | resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
|\ \ | |/ | | | | Change-Id: I9b3379ec26c3a0fb208b8cdd66a0b60088c1b01d
| * Merge "Accept-Language header is not updated when phone language changes"Jean-Baptiste Queru2012-06-251-9/+9
| |\
| | * Accept-Language header is not updated when phone language changesAnders Edenbrandt2012-06-211-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Java class WebSettings has accessor methods for User Agent and Accept-Language strings. These methods ensure that the values are updated if the Locale has changed. However, WebSettings.cpp in WebKit reads the private fields in WebSettings.java directly, and thereby fails to trigger the update. The correction is to use the appropriate accessor methods from WebSettings.cpp. Change-Id: Id1aa1f4de38d2a73cad9660afc35944c663dbd4a
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I4a99d2d262440ec6b6e1c6eed220a9e7cd2ae518
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | |\ \ \
* | | \ \ \ am 8ac8b3f2: Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8ac8b3f2e5f239eb5068c9a5ac17dae28cceec8b': Make viewport dirtyness calculations recursive
| * | | | | Merge "Make viewport dirtyness calculations recursive" into jb-devChris Craik2012-06-211-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make viewport dirtyness calculations recursiveChris Craik2012-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a layer marks the viewport dirty, it should mark all of its children as well, since they likely have also moved. bug:6547356 Change-Id: I0db2704f35e7c8a78108d6ed8372201a7f025994
* | | | | | am c6d9134e: Don\'t allow layers that draw via drawGL to merge with other ↵Chris Craik2012-06-213-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surfaces * commit 'c6d9134e49f290332ca788d10104749a37e9a727': Don't allow layers that draw via drawGL to merge with other surfaces
| * | | | | Don't allow layers that draw via drawGL to merge with other surfacesChris Craik2012-06-203-2/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6694807 They don't paint onto surfacebackings, and draw afterward, so ordering issues occur. Ideally, they should still be allowed to merge onto surfaces and not allow other painting layers to join the surface afterward, but this shouldn't be wasteful in practice. Change-Id: I7a8764bc2b8e531e718602c6114b027a9dbce42d
* | | | | am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '903d2ec97b2ac9cf4f50fc3d7f9e503611bce470': Don't use deleted Node object in setSizeScreenWidthAndScale
| * | | | Merge "Don't use deleted Node object in setSizeScreenWidthAndScale"Jean-Baptiste Queru2012-06-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't use deleted Node object in setSizeScreenWidthAndScaleMattias Falk2012-06-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to forceLayout may cause the Node object to be deleted. Avoid crash by check that the Node object is still valid when forceLayout has returned. Change-Id: Ieb74a59ca7f2e457b3b17d01bcb02cd566f84ef2
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I0c59ded668004ba779faa509ce4c52a74f9f846b
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | |\ \
* | | | \ \ am 4dd92d0a: DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4dd92d0aeca7863ebbda83a97c37267c3fa09fb9': DO NOT MERGE Respect the "Make password visible" setting.
| * | | | | DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6667146 Framework Change: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61 Change-Id: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972
* | | | | am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b8dbaafe072de1d92a3de8d9be6165683a647ace': Call the right updatePositions*
| * | | | Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| |\ \ \ \
| | * | | | Call the right updatePositions*John Reck2012-06-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6634077 Software was accidentally calling the inner updatePositions instead of the outer updatePositions which the hardware path calls. Move the inner updatePositions to be protected instead of public to guard against this in the future as well. Change-Id: Ib509f151ce64bf390383eaa0c32a2bae89428e89
* | | | | | am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9b2be7161983b795edb1ea0e9e70547cd9e466bd': Workaround double blit failure
| * | | | | Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| |\ \ \ \ \
| | * | | | | Workaround double blit failureChris Craik2012-06-123-0/+12
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue occurs on Stingray where calling glTexSubImage2d in order to blit an update to a texture fails silently if the texture has already been updated this frame. With this change, we now draw the tile off-screen to work around the issue just before the second blit is required. This way, the second blit succeeds. bug:6630040 Change-Id: I07213954669b0f3d3f5b87a748a591e532b097b4
* | | | | | am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a762e7bf8891adc575b8b75cf79b710952ad090c': Crash fix by checking null pointer
| * | | | | Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6579681 Regression from https://android-git.corp.google.com/g/#/c/197452/ Change-Id: If185faec6bb2d014c304afbb8ff752ebfc6e4b51
* | | | | am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit ↵Geremy Condra2012-06-110-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plumbing for file origin policy" * commit 'e0766f0882c4e47135e47f5b613589e746a3d085': DO NOT MERGE Add webkit plumbing for file origin policy
| * \ \ \ \ am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit plumbing for file ↵Geremy Condra2012-06-110-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | origin policy" * commit '31874a9d49b110cd82de0efc5eab2c9cddcddde1': DO NOT MERGE Add webkit plumbing for file origin policy
| | * | | | Merge "DO NOT MERGE Add webkit plumbing for file origin policy"Geremy Condra2012-06-111-0/+14
| | |\ \ \ \
| | | * | | | DO NOT MERGE Add webkit plumbing for file origin policySelim Gurun2012-06-061-0/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6212665 This is a cherry-pick from master branch. sha: 0ea6dad65eb77f9347a59704b1f8a019cfc9e01f (cherry picked from commit 57633fd9f863f5e1e4ce8fab0eb05ddb535e1be6) Change-Id: I9c2fa81aa3e16d39ed79d171ae09b1f99d9e7082
* | | | | | am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '7fc1c095b5cb85afd90f47a7bf9a35495bcc64bd': Remove forgotten CHROME_NETWORK_STACK macros
| * | | | | Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove forgotten CHROME_NETWORK_STACK macrosSelim Gurun2012-06-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6637033 It seems that somehow these macros were forgotten to be removed while dropping http stack, it is likely a merge/rebase issue. Change-Id: I37b14488dbfd786e3e0deab9775f42f21d2205e7
generated by cgit v1.1 at 2024-08-20 21:34:42 +0000