summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-164497-206530/+192803
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* am 245a6159: am c0c17d90: am 2934fcc7: Build dmg_fp as a separate libraryKristian Monsen2011-03-315-4/+46
|\ | | | | | | | | * commit '245a61598fdd3dc2548b39d8d4fea7de1bb0024e': Build dmg_fp as a separate library
| * am c0c17d90: am 2934fcc7: Build dmg_fp as a separate libraryKristian Monsen2011-03-315-4/+46
| |\ | | | | | | | | | | | | * commit 'c0c17d9010fab6b79c23065495366bd934bd78d1': Build dmg_fp as a separate library
| | * am 2934fcc7: Build dmg_fp as a separate libraryKristian Monsen2011-03-315-4/+46
| | |\ | | | | | | | | | | | | | | | | * commit '2934fcc75abc95fb5f67aee8184422166b9247da': Build dmg_fp as a separate library
| | | * Build dmg_fp as a separate libraryKristian Monsen2011-03-315-4/+46
| | | | | | | | | | | | | | | | Change-Id: I218892553ea555ead616528b820185194b3e3a0e
* | | | am b6e954e2: am 436d3421: am dc2edc99: Removing nss dependecyKristian Monsen2011-03-317-1685/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b6e954e2d7bcd2c4b0dc7efd5499449e92042c90': Removing nss dependecy
| * | | am 436d3421: am dc2edc99: Removing nss dependecyKristian Monsen2011-03-317-1685/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '436d34214c477f76265bc81d6d8912e4a9b62d84': Removing nss dependecy
| | * | am dc2edc99: Removing nss dependecyKristian Monsen2011-03-317-1685/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'dc2edc99e0ad7b585c413f4bc37da3cad1dda985': Removing nss dependecy
| | | * Removing nss dependecyKristian Monsen2011-03-317-1685/+1
| | | | | | | | | | | | | | | | Change-Id: Ica9ab9cbaf008afbb8201d1a2c346db24c31ed35
* | | | am 93be2169: am 0e4a5f26: am 6e4a9bc7: Moving libevent and modp_b64 to ↵Kristian Monsen2011-03-3110-34/+127
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | seperate makefiles. * commit '93be21693103b540ead97f7750f2e0327d318efb': Moving libevent and modp_b64 to seperate makefiles.
| * | | am 0e4a5f26: am 6e4a9bc7: Moving libevent and modp_b64 to seperate makefiles.Kristian Monsen2011-03-3110-34/+127
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0e4a5f26a01b381b0931050fec94d8b9dfcfc113': Moving libevent and modp_b64 to seperate makefiles.
| | * | am 6e4a9bc7: Moving libevent and modp_b64 to seperate makefiles.Kristian Monsen2011-03-3110-34/+127
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '6e4a9bc770f7c9868977f4321d88764467a9f66e': Moving libevent and modp_b64 to seperate makefiles.
| | | * Moving libevent and modp_b64 to seperate makefiles.Kristian Monsen2011-03-3110-34/+127
| | | | | | | | | | | | | | | | Change-Id: Ic7fee690ab1e98f025c90127b93cbea4150d0b78
* | | | am e8f85ddf: am e416d04b: am f62b871a: Remove more projects from ↵Bart Sears2011-03-314-3981/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | external/chromium that are not needed * commit 'e8f85ddfc4ad4f42f57d9e01474f7ffda8eb2535': Remove more projects from external/chromium that are not needed
| * | | am e416d04b: am f62b871a: Remove more projects from external/chromium that ↵Bart Sears2011-03-314-3981/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | are not needed * commit 'e416d04be67622fabb495641955249cad4efa2bf': Remove more projects from external/chromium that are not needed
| | * | am f62b871a: Remove more projects from external/chromium that are not neededBart Sears2011-03-314-3981/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'f62b871af464c8cdbc34299a9d7893f54fb7d113': Remove more projects from external/chromium that are not needed
| | | * Remove more projects from external/chromium that are not neededBart Sears2011-03-304-3981/+0
| | | | | | | | | | | | | | | | | | | | Bug: 4194380 Change-Id: I2b4be1ce797244c7c89d494707910b8187d5ad02
* | | | am 80c4073a: am 5f4b50b3: am 47c0a16e: Removing projects that are not needed ↵Kristian Monsen2011-03-30116-52864/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to compile * commit '80c4073a248664f4c3568f917d293909c77d7070': Removing projects that are not needed to compile
| * | | am 5f4b50b3: am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-30116-52864/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5f4b50b39e01b3818e293cb5c6933500eee85a97': Removing projects that are not needed to compile
| | * | am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-30116-52864/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '47c0a16e8b9f5c6cfb515871409697aa20236ed5': Removing projects that are not needed to compile
| | | * Removing projects that are not needed to compileKristian Monsen2011-03-30116-52864/+0
| | | | | | | | | | | | | | | | | | | | Bug: 4194380 Change-Id: Idf9ea7c893786dc3cb7ad869563679e1c8c56aed
* | | | am 237ad699: am df5fef6c: Reduce the TCP Keep Alive intervalBen Murdoch2011-03-251-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '237ad69912eb2a18feb3a99e000d38faf7d78089': Reduce the TCP Keep Alive interval
| * | | am df5fef6c: Reduce the TCP Keep Alive intervalBen Murdoch2011-03-251-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'df5fef6c965bc95a2b6c3827a6a90c51667ffb9e': Reduce the TCP Keep Alive interval
| | * | Reduce the TCP Keep Alive intervalBen Murdoch2011-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the TCP Keep Alive timeout and interval to prevent the page hanging when routers aggressively terminate connections Bug: 4107114 Change-Id: Iea35d47e32a025be2f63095d0f380e1e4fed4faf
* | | | am 8a1c04d4: am 3d6f5e4a: Cherry pick Chrome r71482Ben Murdoch2011-03-221-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8a1c04d4e11a807967686a3de8f208f5bc93eb06': Cherry pick Chrome r71482
| * | | am 3d6f5e4a: Cherry pick Chrome r71482Ben Murdoch2011-03-221-0/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3d6f5e4a9a66d7ad3fb2cb548adc5da3f82b31b5': Cherry pick Chrome r71482
| | * | Cherry pick Chrome r71482Ben Murdoch2011-03-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement TCP keep alive packets. Bug: 4107114 Change-Id: I7b5f1610c79002a8f97f39d51d557d85f390b997
* | | | am b0693ee7: am 7b9ca917: Fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-1125-27/+203
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b0693ee76073a72d89cacdfb670e117e8902e64b': Fix for bug 3491968 Browser frozen on dunkindonuts.com
| * | | am 7b9ca917: Fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-1125-27/+203
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7b9ca917061470268bf3395c8925d4b9cc52d8e1': Fix for bug 3491968 Browser frozen on dunkindonuts.com
| | * | Fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-1125-27/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a sync request returns ERR_IO_PENDING it will block and never complete. Waiting for connect() to complete with select(). If it doesn't complete within 20 seconds, return an error. Change-Id: Ie5859b482dd64248036c2ad9ef57e63d468db2d4
* | | | am 6bc130e8: am 21ae5860: Chromium part of fix for bug 3491968 Browser ↵Kristian Monsen2011-03-1012-9/+128
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | frozen on dunkindonuts.com * commit '6bc130e8329796a16ca946f6d3b0dfcc2bae5c7e': Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.com
| * | | am 21ae5860: Chromium part of fix for bug 3491968 Browser frozen on ↵Kristian Monsen2011-03-1012-9/+128
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | dunkindonuts.com * commit '21ae586050b3022a662bfe7743553d462ae4ced8': Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.com
| | * | Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-0912-9/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Letting sync requests create sockets even if the total number of sockets has reached max or the number of sockets in the group is full. Change-Id: Id6f4e0015af67d1b4124f00106433b1977995f45
* | | | am 4a87e69c: am fac8ff3b: Updating the des code, mostly just proper castsKristian Monsen2011-03-041-6/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4a87e69c76d4407e50e56ebf0efcc6efbf8e97f9': Updating the des code, mostly just proper casts
| * | | am fac8ff3b: Updating the des code, mostly just proper castsKristian Monsen2011-03-041-6/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'fac8ff3b63c4430422aed85bda94d0bfb168c224': Updating the des code, mostly just proper casts
| | * | Updating the des code, mostly just proper castsKristian Monsen2011-03-031-6/+11
| | | | | | | | | | | | | | | | Change-Id: I9fd913e6d41f35ce0df0080d5deae14ac04e1d42
* | | | am 08501af9: (-s ours) am e00741fe: Fix for bug 2386130 VZW:PP659: login ↵Kristian Monsen2011-03-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | issues on some sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge * commit '08501af9301064c9429766009473268fe1132853': Fix for bug 2386130 VZW:PP659: login issues on some sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge
| * | | am e00741fe: Fix for bug 2386130 VZW:PP659: login issues on some ↵Kristian Monsen2011-03-031-10/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge * commit 'e00741fe4b5b3d04d95b48b19d56c94fc9bc0237': Fix for bug 2386130 VZW:PP659: login issues on some sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge
| | * | Fix for bug 2386130 VZW:PP659: login issues on some ↵Kristian Monsen2011-03-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge Tested with the test site from the bug. Looks like it works! Cherry picked from master Change-Id: I795128a1c50d10e8c23d9d5fb70362853355485d
* | | | am c3013017: am 8db08726: Importing two ssl_client_socket_openssl.cc patches ↵Brian Carlstrom2011-03-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | from upstream chromium * commit 'c30130175bac0c538dbe09880c0b9b005ae7a350':
| * | | am 8db08726: Importing two ssl_client_socket_openssl.cc patches from ↵Brian Carlstrom2011-03-031-14/+45
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | upstream chromium * commit '8db08726a8eea9d32f637ced774aac6b16416071': Importing two ssl_client_socket_openssl.cc patches from upstream chromium
* | | | am e04deb3b: am 82554461: Merge Chromium at 9.0.597.107: Tag version.Ben Murdoch2011-03-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit 'e04deb3b183576b7f35b2cabb4b772adc6757337':
| * | | am 82554461: Merge Chromium at 9.0.597.107: Tag version.Ben Murdoch2011-03-031-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '82554461436762b87868238c092cdf01994f7972': Merge Chromium at 9.0.597.107: Tag version.
* | \ \ \ am 04b47906: am a156b727: Merge "Fix for bug 3435888 Native crash in Browser"Kristian Monsen2011-03-030-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '04b47906404f32d44ffc158d94612efab35a1345':
| * | | | am a156b727: Merge "Fix for bug 3435888 Native crash in Browser"Kristian Monsen2011-03-031-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a156b7278fc40b0cbc5000aff4a01367f6528dcc': Fix for bug 3435888 Native crash in Browser
* | \ \ \ \ am 60434833: am 9d25cad4: Remove native localised strings cache.Ben Murdoch2011-03-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '604348339a61e2c480949292434fc01b274df9b4':
| * | | | | am 9d25cad4: Remove native localised strings cache.Ben Murdoch2011-03-031-6/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d25cad4fe524601a78e3d8c1844b8708537401f': Remove native localised strings cache.
* | \ \ \ \ \ am ffa58403: am d8e800e5: Localise autofill regular expressionsBen Murdoch2011-03-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit 'ffa584035935eda22ab2bc8cac4d5ad78bab3443':
| * | | | | | am d8e800e5: Localise autofill regular expressionsBen Murdoch2011-03-036-51/+125
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8e800e5cd4b5ff1c84124f27b98f9c174ec2738': Localise autofill regular expressions
* | \ \ \ \ \ \ am 2293d51c: am a0a75b28: Do not cache the JNIEnv pointer.Ben Murdoch2011-03-030-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | * commit '2293d51c0f8247581c3fca93b88f25626212c7c2':