summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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>
* Fix for build breakKristian Monsen2011-10-241-2/+3
| | | | | | Export needed function for SPDY support Change-Id: I2a6c819d79dbc9dcf2e12eb41072cc0245954200
* 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
* 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
* 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
* 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
* 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
* 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
* 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 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 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 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
* Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| | | | | Bug: 5244039 Change-Id: I2d4f66b2f5e64c2cab247574cdfd8fa2d707cad8
* 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
* Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| | | | | Bug: 5244039 Change-Id: I385642faf33ec9f3875cfd035c9500e7342ca17d
* Use notable values when clearing Thread::startup_data_ to help with debuggingSteve Block2011-09-301-0/+10
| | | | | Bug: 5244039 Change-Id: I2f91ceb69c140b70b550eda83aa6bbafc95631f2
* 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
* 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 c391e782: (-s ours) Fix for bug 5226268 [Browser] http keep-alive DO NOT ↵Kristian Monsen2011-09-180-0/+0
|\ \ | |/ |/| | | | | | | | | MERGE * commit 'c391e78224fccd37c5d3d7f90309a86b8f384793': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
| * 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
* Fix for bug 4487538 Current DrainKristian Monsen2011-09-084-0/+24
| | | | | | | | | Closing idle connections when timers are paused. Cherry-picking from: http://codereview.chromium.org/7380004/ Change-Id: Ief5de0ec6665c6cd27f3bb2639297675f44fa28d
* Merge "external/chromium: Handle SSL proxy case for UID tracking. ↵Ashish Sharma2011-09-061-1/+11
|\ | | | | | | b/5227671"
| * external/chromium: Handle SSL proxy case for UID tracking.Ashish Sharma2011-09-051-1/+11
| | | | | | | | | | | | b/5227671 Change-Id: I93bf9ca01370f727666e0d83cc442416ed035070
* | Merge "Fix for bug 5232736 Remove "DigiNotar Root CA""Kristian Monsen2011-09-028-10/+326
|\ \
| * | Fix for bug 5232736 Remove "DigiNotar Root CA"Kristian Monsen2011-09-018-10/+326
| |/ | | | | | | | | | | | | | | | | | | Chery pick of: http://src.chromium.org/viewvc/chrome?view=rev&revision=98750 http://codereview.chromium.org/7791032/diff/6001/net/base/x509_certificate.cc This should be it for master. Change-Id: I077b2efb328bda349232cd6e3e3f69e1c5460367
* | Adding method for closing idle connectionsKristian Monsen2011-09-022-0/+11
|/ | | | | | | | | Part of fix for bug 4487538 Current Drain Being worked on upstream in: http://codereview.chromium.org/7380004/ Change-Id: I1b03aef9211e4dd2ad640c6c5b43622a105cbbd8
* Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS ↵Kristian Monsen2011-08-161-2/+2
| | | | | | | | vs HCMR2 Reenabling chromium as a shread lib Change-Id: I25fa08800417c5149f5ea8944f182eeae4bfc3b4
* transport socket pool: Fix missing init for valid UIDsJP Abgrall2011-08-121-1/+5
| | | | | | | | Missing class member init specific to ANDROID would cause socket tagging to be attempted most of the time. Change-Id: I0ac745efb764b24da9372721fc34596dd5b4ab34 Signed-off-by: JP Abgrall <jpa@google.com>
* Part of fix for bug 5152544 Reduce the number of warningKristian Monsen2011-08-112-0/+15
| | | | Change-Id: I960864ea02e41fda180544a5d077f63c3c3119b9
* Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS ↵Kristian Monsen2011-08-101-2/+2
| | | | | | | | vs HCMR2 Trying to build with static libchromium on the build server. Change-Id: I7c42956d31ee854f036848e96ef4bf863a07bb1d
* external/chromium: Fix a comma typo.Ashish Sharma2011-08-091-2/+2
| | | | Change-Id: Ia6cf2a11537db2fe61670f2544e33e8ac5e8c118
* Network traffic accounting for client applications that use chromiumAshish Sharma2011-08-0930-15/+359
| | | | | | URLRequest stack. Change-Id: If7821debd1b10b19ebf5a3e7b9f6570efc73c4fc
* Fix for bug 5105584Kristian Monsen2011-08-032-5/+8
| | | | | | Check for JavaVM pointer being null before using it Change-Id: I8fe404eaf716893dc88375c69383033a25277569
* Another build fix for x86 buildsKristian Monsen2011-07-291-1/+7
| | | | Change-Id: Ide506e5be56103910f5c426dc672f2f678724521
* Fix build break in AOSPKristian Monsen2011-07-291-0/+2
| | | | Change-Id: I7e4a6a81680f9339293d66ac060cde2e1c312cc9
* Part of fix for 5065047: build libchromium as a shared libKristian Monsen2011-07-2810-52/+113
| | | | | | | | | Linking chromium_net as a static lib. Needed to update the jni to be handled internally instead of using the one from webkit it got linked with. Change-Id: Ia717a29afa879be39835d22faacb6c4810728b53
* Preparation for fixing bug 5065047: build libchromium as a shared libKristian Monsen2011-07-287-19/+4
| | | | | | Use FormField from chromium instead of Android. Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0
* Merge Chromium at 12.0.742.130: Update CHROMIUM_MERGE_REVISIONKristian Monsen2011-07-261-2/+2
| | | | | | 5080607 Update external/chromium to latest revision Change-Id: I4d5f666dc987f6036d6e45efcadd1d18e2d238d2
* Merge Chromium at 12.0.742.130: Fix conflictsKristian Monsen2011-07-261-11/+0
| | | | | | | | | | 5080607 Update external/chromium to latest revision Did not sync the build directory last merge, so git think it is added, this gives a conflict in the file with local changes. Change-Id: I3e2fcf5f78a02046a092ef8a3e31bd8ba0429b52
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-2680-299/+6326
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Merge "Query the platform for the Autofill server URL."Ben Murdoch2011-07-254-0/+59
|\
| * Query the platform for the Autofill server URL.Ben Murdoch2011-07-214-0/+59
| | | | | | | | | | | | | | | | | | | | The URL to use to make autofill requests is now configured by the platform. Add a JNI call to retrieve it. See also frameworks/base change I0aa85c5bef834b1120baaabdc2dd2e4e607a63b6 Bug: 4515820 Change-Id: I3a22ae42402f52207eee2d0d9df64700cb7c9f45
* | Remove the v8 dependecy from libchromium.Kristian Monsen2011-07-212-2/+6
|/ | | | | | Also fixed the makefile a bit. Change-Id: Ib63720dbd62d477657aa49a159f1b4f7956785d6
* Implement AutofillCountry::ApplicationLocale() on Android.Ben Murdoch2011-07-133-3/+18
| | | | | | | Call JNI to determine the current locale for the system. Bug: 4959752 Change-Id: I6429239356842175599f1f458c77226b933a8c26
generated by cgit v1.1 at 2024-12-23 06:52:01 +0000