summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am a972e26e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-174-22/+56
|\ | | | | | | | | * commit 'a972e26e14066ec50afdaf4582836fe5fc4c190a': Part of fix for bug 5523834, backporting cache fixes
| * Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-154-22/+56
| | | | | | | | | | | | | | | | | | This is hopefully a fix for bug 5255299 Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=84877 Change-Id: Ie38ecab599eb0d1bdb8a77efd7dd7f416ef26701
* | am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1116-62/+1252
|\ \ | |/ | | | | | | * commit '2c4085b2006233b5e3a3fe507d62642377b5dc2e': Backport SPDY ping changes from chrome 16.
| * Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1016-62/+1252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5524112 Backported Chrome 16 changes for SPDY Ping. The Chrome changes are: http://codereview.chromium.org/8036016 http://codereview.chromium.org/8230037 http://codereview.chromium.org/8319015 http://codereview.chromium.org/8330002 Also enable the SPDY protocol. Change-Id: I2c25c19135ec1c75361d51fdbfbbbbb19f0a3098 Signed-off-by: Selim Gurun <sgurun@google.com>
* | keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
|\ \ | |/ |/|
| * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| |\
| | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |\ | |/ / |/| / | |/
| * am 92b6b8e6: Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
| |\ | | | | | | | | | | | | * commit '92b6b8e6dd0ba578b9091f7826568fccab6d2cf9': fix for bug 5454586, fix up getDbThread()
| | * Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
| | |\ | |/ / |/| |
| | * fix for bug 5454586, fix up getDbThread()Kristian Monsen2011-10-241-41/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a LazyInstance and removing getter function, just using the object that should now be thread safe. Minor indenting change. Change-Id: I9deca3f10d96fdaf655a28b8f4d8db8efdc1803a
| * | am b54fbb0d: Fix for build breakKristian Monsen2011-10-241-2/+3
| |\ \ | |/ / |/| | | | | | | | * commit 'b54fbb0d9cf6451f1683823838b6c0d2b345ed4b': Fix for build break
* | | Fix for build breakKristian Monsen2011-10-241-2/+3
| |/ |/| | | | | | | | | Export needed function for SPDY support Change-Id: I2a6c819d79dbc9dcf2e12eb41072cc0245954200
| * am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting ↵Kristian Monsen2011-10-241-3/+3
| |\ | |/ |/| | | | | | | | | everything * commit '9fb7297dd54aca7ba646ee27608529f33634a7b2': Part of fix for bug 5455901 Fix makefile, turn off exporting everything
* | Part of fix for bug 5455901 Fix makefile, turn off exporting everythingKristian Monsen2011-10-211-3/+3
| | | | | | | | | | | | | | Final fix, turn off exporting everything in the makefile, and add needed defines Change-Id: Id0ed1eefa375462a9023ff22ea692631d8477a93
| * am 41543423: Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-245-11/+36
| |\ | |/ |/| | | | | * commit '4154342345fc67972570f59528233826cd397f1e': Part of fix for bug 5455901 Export symbols from base
* | Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-215-11/+36
| | | | | | | | | | | | Some are upstream, others guarded with #ifdef ANDROID are not Change-Id: I8615feafc0ad088d237794acdace655d9f842c12
| * am a1fe9c04: Part of fix for bug 5455901 Add exports needed for autofill and ↵Kristian Monsen2011-10-247-8/+61
| |\ | |/ |/| | | | | | | | | cookies * commit 'a1fe9c0450e6d56112949b33ef2f7491e0cf0f60': Part of fix for bug 5455901 Add exports needed for autofill and cookies
* | Part of fix for bug 5455901 Add exports needed for autofill and cookiesKristian Monsen2011-10-217-8/+61
| | | | | | | | | | | | | | Local only exports due to using of autofill and cookies outside chromium. All changes marked with #ifdef ANDROID Change-Id: I72dcd7fe0fe546073c271663123ba17469deaa83
| * am 25577496: Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2429-55/+94
| |\ | |/ |/| | | | | * commit '2557749644f9d25af9721533322db19197c49b49': Part of fix for bug 5455901 Export symbols from net/
* | Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2129-55/+94
| | | | | | | | | | | | | | | | | | | | | | | | Exporting needed symbols for linking libwebcore and libstagefright. Everything here is cherrypicks from upstream, but only taking the definitions we need to satisfy linker errors. One exception is in openssl_private_key_store.h, which because of this uses an android guard. Change-Id: I74a8f2bfd63a83c2c1684ba955fcdf00bcb2666a
| * am a3fef89e: Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-243-3/+6
| |\ | |/ |/| | | | | * commit 'a3fef89eb00853adb6524ab3d11c60f754f08b09': Part of fix for bug 5455901 Export symbols in android/
* | Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-213-3/+6
| | | | | | | | | | | | | | | | Exporting needed symbols from Android specific code. Used NET_EXPORT for net code and BASE_API for other code. Change-Id: Ief7426180eec993bbe894e7231b224dcac657c7b
| * am cd7ce18e: Part of fix for bug 5455901 adding net_export.hKristian Monsen2011-10-241-0/+34
| |\ | |/ |/| | | | | * commit 'cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0': Part of fix for bug 5455901 adding net_export.h
* | Part of fix for bug 5455901 adding net_export.hKristian Monsen2011-10-211-0/+34
| | | | | | | | | | | | Adding net/base/net_export as it is in ToT chromium. Change-Id: Ia6e36b981854b26cf4ccdb315941dfb05aea0ff4
| * am eaa86de4: Remove temporary debug loggingSteve Block2011-10-193-74/+0
| |\ | |/ |/| | | | | * commit 'eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc': Remove temporary debug logging
* | Remove temporary debug loggingSteve Block2011-10-193-74/+0
| | | | | | | | | | | | | | | | This is a cherry-pick of https://android-git.corp.google.com/g/#/c/141900, which went into ics-mr0 only. Bug: 5454995 Change-Id: I970b59f6da4890d0b89566ffa1909c33707f9506
| * am 8d1e40fa: am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() ↵Steve Block2011-10-141-12/+26
| |\ | |/ |/| | | | | | | | | to be threadsafe * commit '8d1e40fa83064d70b192f1b5aed95b8fc24e4cac': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
* | am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafeSteve Block2011-10-141-12/+26
|\ \ | | | | | | | | | | | | * commit 'c0c5e0fca18f5a0912fdba1bd5c5ca2ad0c2693c': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
| * | Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-141-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is an updated version of https://android-git.corp.google.com/g/#/c/141899, which was rolled out, with the lock now static and moved to file scope to match Chromium style. Bug: 5244039 Change-Id: Ic6a6e949b2adc8cf433e6468c1f84ed449af09bc
| | * am 7d980efe: am df5ec85c: Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
| | |\ | |_|/ |/| | | | | | | | * commit '7d980efe6a2f9473c310a16bed689819ff3dee62': Causing webviews to hang.
* | | am df5ec85c: Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
|\ \ \ | |/ / | | | | | | | | | * commit 'df5ec85c1f7d3b444e458a4652302aca23624cc1': Causing webviews to hang.
| * | Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
| |\ \
| | * | Causing webviews to hang.Chris Craik2011-10-131-21/+12
| | | | | | | | | | | | | | | | | | | | Revert "Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe" This reverts commit 47f5154a4217fb3626326224fc1c7d3c9918dd09
| | | * am e3b44106: (-s ours) am 08712c35: (-s ours) Remove temporary debug logging ↵Steve Block2011-10-130-0/+0
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | - DO NOT MERGE * commit 'e3b44106f63aebd3a6e753bdebe4962455d5fcb9': Remove temporary debug logging - DO NOT MERGE
* | | | am 08712c35: (-s ours) Remove temporary debug logging - DO NOT MERGESteve Block2011-10-130-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * commit '08712c353f0e36ed1c0fd55ff369ca899d1bc9c5': Remove temporary debug logging - DO NOT MERGE
| * | Remove temporary debug logging - DO NOT MERGESteve Block2011-10-133-74/+0
|/ / | | | | | | | | Bug: 5244039 Change-Id: Ia383537b83933da362f4c7c7eba4b4886bce4ed5
| * am 47f5154a: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| |\ | |/ |/| | | | | * commit '47f5154a4217fb3626326224fc1c7d3c9918dd09': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
* | Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| | | | | | | | | | Bug: 5244039 Change-Id: I2d4f66b2f5e64c2cab247574cdfd8fa2d707cad8
| * am d0a07ba4: More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| |\ | |/ |/| | | | | * commit 'd0a07ba49f88f1e331ac5fd80f30c81d975ebd12': More logging in Thread to help debugging
* | More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| | | | | | | | | | | | | | Add a check for multiple overlapping calls to StartWithOptions() Bug: 5244039 Change-Id: Ic89b94309126cc53320c3e7973c0eea0d88fd9c4
| * am 28480d4f: Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| |\ | |/ |/| | | | | * commit '28480d4f48373da735986b2a75e099d3cfddab3e': Add more logging to Thread and WaitableEvent to help debugging
* | Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| | | | | | | | | | Bug: 5244039 Change-Id: I385642faf33ec9f3875cfd035c9500e7342ca17d
| * am 9306e92a: Use notable values when clearing Thread::startup_data_ to help ↵Steve Block2011-10-031-0/+10
| |\ | |/ |/| | | | | | | | | with debugging * commit '9306e92a0b28f7c70a3e29272141b0e271452479': Use notable values when clearing Thread::startup_data_ to help with debugging
* | Use notable values when clearing Thread::startup_data_ to help with debuggingSteve Block2011-09-301-0/+10
| | | | | | | | | | Bug: 5244039 Change-Id: I2f91ceb69c140b70b550eda83aa6bbafc95631f2
| * am e4aeb840: Reapply: Fix for bug 5226268 [Browser] http keep-aliveKristian Monsen2011-09-202-0/+11
| |\ | |/ |/| | | | | * commit 'e4aeb840e5cd2acd20cf6b18af808af55a92e745': Reapply: Fix for bug 5226268 [Browser] http keep-alive
* | Reapply: Fix for bug 5226268 [Browser] http keep-aliveKristian Monsen2011-09-192-0/+11
| | | | | | | | | | | | | | | | | | Disabling connection reuse so we can disable keep-alives. Needs a CL from external/webkit: https://android-git.corp.google.com/g/#/c/135470/ Change-Id: I441682ee20f4b2ead8f0b0c945257ab56b607acf
| * am d2fbc57a: Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
| |\ | |/ |/| | | | | * commit 'd2fbc57a904aa88c9b79b1c34d6e2f5520a2ad78': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
* | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
|\ \ | | | | | | | | | Change-Id: Iea480d23d42400ddb693da5615c64c7d37997c29
| * | Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGEKristian Monsen2011-09-182-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling connection reuse so we can disable keep-alives. Needs a CL from external/webkit: https://android-git.corp.google.com/g/#/c/135470/ Change-Id: If8cdfb2c1686d8c971f6025b1e9ae75f57dd7f16
| | * am 2e6e5ef7: (-s ours) am c391e782: (-s ours) Fix for bug 5226268 [Browser] ↵Kristian Monsen2011-09-180-0/+0
| | |\ | |/ / | | / | |/ |/| | | | | http keep-alive DO NOT MERGE * commit '2e6e5ef77762f9f5bca72bf42842a5aa1baa2953': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
generated by cgit v1.1 at 2024-12-23 06:46:52 +0000