summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-262236-29589/+102754
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge "Minor cleanup of the DoubleBufferedTexture."Derek Sollenberger2010-10-261-7/+5
|\
| * Minor cleanup of the DoubleBufferedTexture.Derek Sollenberger2010-10-221-7/+5
| | | | | | | | Change-Id: Ie3236502942eed684ac6b4602493cbf384fe8ba0
* | Merge "Remove any scheduled painting for BaseTile that are going to be ↵Nicolas Roard2010-10-256-15/+74
|\ \ | | | | | | | | | deallocated."
| * | Remove any scheduled painting for BaseTile that are going to be deallocated.Nicolas Roard2010-10-256-15/+74
| | | | | | | | | | | | Change-Id: I9f46df074fedb3b157f54b2f03b33ecc80fca9ab
* | | Merge "Remove unused dispatchDidLoadResourceByXMLHttpRequest"Ben Murdoch2010-10-252-5/+0
|\ \ \
| * | | Remove unused dispatchDidLoadResourceByXMLHttpRequestBen Murdoch2010-10-252-5/+0
| |/ / | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/57210 Change-Id: I82ddff6e4d04e2c36dad2518e4e27a695728bc95
* | | Hide details of private browsing for URLRequestContext from Chromium ↵Steve Block2010-10-251-1/+6
| | | | | | | | | | | | | | | | | | AutoFill code Change-Id: I58a388ecf16b2af4f1cd31afb39d0aa6c5c44a24
* | | Add a JNI method to determine which HTTP stack is in useSteve Block2010-10-251-1/+10
|/ / | | | | | | | | | | | | | | | | This will be required when hooking up CookieManager to the Chromium stack, as we need to decide in Java whether or not to call into native code. Bug: 3116410 Change-Id: I4e148ad2c38a6e5771912dc419f52c8098027958
* | Fix for ALT_HTTP build breakKristian Monsen2010-10-222-2/+4
| | | | | | | | | | | | | | Was broken by this CL: https://android-git.corp.google.com/g/#change,75473 Change-Id: I6f60fd1e19eafe84f9d2f72f556493a25c2caf0e
* | For non user-scrolled scroll, don't send scroll event.Shimeng (Simon) Wang2010-10-222-8/+10
|/ | | | | | | | This is in conjunction with Java side CL: https://android-git.corp.google.com/g/75647 issue: 3063945 Change-Id: I3f0bb11e25ee4ea7615980e2bc6cefb2064d4d9d
* Cleanup DoubleBufferedTexture and SharedTexture classes.Derek Sollenberger2010-10-226-45/+29
| | | | | | | | | | | | The cleanup consisted of... 1. removing uneeded mutex calls 2. ensuring user's of the class fully initialize them before use 3. hiding protected variables to prevent potential misuse by subclasses There will be a follow on CL focusing on cleaning up the use of mutexes in BackedDoubleBufferedTexture. Change-Id: Ia642d54d8a5b154ac287640a07d8b2c0e5d85334
* Add missing indexedDB tests at r68651.Ben Murdoch2010-10-222-0/+93
| | | | | | | These were missed in the merge to r67178 and are needed for the next merge to r70157. Change-Id: Ic76e75ffe5ed40e83534cee470ca10c9718aba8b
* Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"Steve Block2010-10-224-1/+65
|\
| * Hook up CookieManager.removeAllCookie() for the Chromium HTTP stackSteve Block2010-10-224-1/+65
| | | | | | | | | | | | | | | | Requires a change to frameworks/base ... https://android-git.corp.google.com/g/75471 Bug: 3086308 Change-Id: I062015c990f6bc3d77ec22c746bd8465ed74bd08
* | Merge "Fix a compiler warning in WebRequest.cpp"Steve Block2010-10-221-2/+2
|\ \ | |/ |/|
| * Fix a compiler warning in WebRequest.cppSteve Block2010-10-221-2/+2
| | | | | | | | Change-Id: I4ece067b344b7a132f04451ce9810993d8ed73f0
* | Fix naming for JNI registration methodsSteve Block2010-10-2214-42/+42
|/ | | | Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7
* am d844e1f0: (-s ours) am 2da7ed0b: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ | | | | | | | | | | | | | | | | (webkit.org r67967) Do not merge Merge commit 'd844e1f030065939140c0fa927fe89b367d5bd40' * commit 'd844e1f030065939140c0fa927fe89b367d5bd40': Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
| * am 2da7ed0b: Cherry-pick WebKit security fix (webkit.org r67967) Do not mergeBen Murdoch2010-10-211-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3' into gingerbread-plus-aosp * commit '2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3': Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r67967) Do not mergeBen Murdoch2010-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/67967 Note this is only a partial cherry pick of r67967 as it is based on a CL later than our current revision and not all deltas are relevant. Change-Id: I7d153c9470abb2b0994900b2c5909fded4a94752
* | | am c194fa2c: (-s ours) am ee4c9585: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r69345) Do not merge Merge commit 'c194fa2ce4ff53dae520be0ee6759a6f9f367db0' * commit 'c194fa2ce4ff53dae520be0ee6759a6f9f367db0': Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
| * | am ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not mergeBen Murdoch2010-10-212-2/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e' into gingerbread-plus-aosp * commit 'ee4c9585fe53aff7a0aa833b9a5d3e861e16578e': Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r69345) Do not mergeBen Murdoch2010-10-212-2/+9
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/69345 Change-Id: Ie0f421c22fc4ec007417181c834e50033a389230
* | | am 219c89f0: (-s ours) am 3017f37b: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r68705) Do not merge Merge commit '219c89f043c10eba31fc94db69a8136bbc115d1d' * commit '219c89f043c10eba31fc94db69a8136bbc115d1d': Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
| * | am 3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not mergeBen Murdoch2010-10-211-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3017f37b06cfa16f11a1e986e3c4ecc0c4757c32' into gingerbread-plus-aosp * commit '3017f37b06cfa16f11a1e986e3c4ecc0c4757c32': Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r68705) Do not mergeBen Murdoch2010-10-211-0/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/68705 Change-Id: I5a3b76fa6e536746af794a15b187bc197000387b
* | | am 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r69476) Do not merge Merge commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376' * commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376': Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
| * | am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not mergeBen Murdoch2010-10-211-1/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6' into gingerbread-plus-aosp * commit '910dc2ab50b8f32067f7b45f9e46d26a2aa681c6': Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r69476) Do not mergeBen Murdoch2010-10-211-1/+6
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/69476 Change-Id: If25c271f9d1cda225fbdf040d2f1d2bc57529768
* | | am d377cc76: (-s ours) am 80a0e2c2: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r68408) Do not merge Merge commit 'd377cc767167c529a2effc0b1740b31f01ba6f9d' * commit 'd377cc767167c529a2effc0b1740b31f01ba6f9d': Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
| * | am 80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not mergeBen Murdoch2010-10-212-3/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf' into gingerbread-plus-aosp * commit '80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf': Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r68408) Do not mergeBen Murdoch2010-10-212-3/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/68408 Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53
* | | am 741c2272: (-s ours) am d3bed0e7: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r68096) Do not merge Merge commit '741c22725f573421f088db6a32064bf210ba80ae' * commit '741c22725f573421f088db6a32064bf210ba80ae': Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
| * | am d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not mergeBen Murdoch2010-10-214-5/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'd3bed0e7c739f46e955406b920498b86724e7705' into gingerbread-plus-aosp * commit 'd3bed0e7c739f46e955406b920498b86724e7705': Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r68096) Do not mergeBen Murdoch2010-10-214-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/68096 Note that this is not an exact cherry pick of the above webkit CL as it is dependant on http://trac.webkit.org/changeset/61094 that we do not have and provides the Element::isIdAttributName and Element::getIdAttribute methods. 61094 is a large change so we do not take it, rather use methods that achieve the same effect. Change-Id: Ifae90116f794673a610dd7988ba366a0b51888d9
* | | am 7616c8cd: (-s ours) am 8da84207: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r68485) Do not merge Merge commit '7616c8cd53cceb7d29b9382fc6754e46725af8fc' * commit '7616c8cd53cceb7d29b9382fc6754e46725af8fc': Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
| * | am 8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not mergeBen Murdoch2010-10-211-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '8da84207b2b14801ccc039279df2a859a4a52847' into gingerbread-plus-aosp * commit '8da84207b2b14801ccc039279df2a859a4a52847': Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r68485) Do not mergeBen Murdoch2010-10-211-1/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/68485 Change-Id: I714d385759a6e30d315cd2ace4aa87a2d7b28e92
* | | am ec63c9f9: (-s ours) am a7b8ec70: Cherry-pick WebKit security fix ↵Ben Murdoch2010-10-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (webkit.org r68860) Do not merge Merge commit 'ec63c9f977997c275ca985c2ffa5cad8a2e29523' * commit 'ec63c9f977997c275ca985c2ffa5cad8a2e29523': Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
| * | am a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not mergeBen Murdoch2010-10-211-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a7b8ec708c2566cc6e69c0b464e416c018227b02' into gingerbread-plus-aosp * commit 'a7b8ec708c2566cc6e69c0b464e416c018227b02': Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
| | * Cherry-pick WebKit security fix (webkit.org r68860) Do not mergeBen Murdoch2010-10-211-1/+4
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/68860 Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c
* | | Merge "Fix debug statements."Patrick Scott2010-10-212-1/+2
|\ \ \
| * | | Fix debug statements.Patrick Scott2010-10-212-1/+2
| | | | | | | | | | | | | | | | Change-Id: Id37bf0a8b5864fea2490bd2dc5d4a1f52bc56c1d
* | | | Merge "Move jstringToStdString into WebCoreJni.h"Steve Block2010-10-213-9/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Move jstringToStdString into WebCoreJni.hIain Merrick2010-10-213-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also tweaked the implementation slightly to match jstringToString16, which is more robust. Change-Id: I614576615a6f429ea1632c395d5bc4e068c32cfb
* | | | Fix Chromium HTTP request context getters to use raw pointersSteve Block2010-10-216-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All call sites into the Chromium stack take raw pointers rather than scoped_refptr, so we should do the same for simplicity. This change also makes the ownership model more clear. Previously we were sometimes throwing away the scoped_refptr and using the raw pointer, which is unsafe unless you know that somebody else holds a reference. Requires a change to external/chromium ... https://android-git.corp.google.com/g/75220 Change-Id: I09c86d424193a3f3c2644bcf77a2d363fa24293b
* | | | Merge "Fix tiles starvation bug + some debug logs"Nicolas Roard2010-10-205-8/+27
|\ \ \ \
| * | | | Fix tiles starvation bug + some debug logsNicolas Roard2010-10-205-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:3112643 Change-Id: I9d5adf51dc95f44b859b107666d2c2731f37b12c
* | | | | Merge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"Ben Murdoch2010-10-203-7/+11
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.1 at 2025-03-28 18:40:55 +0000