| 2c4085b2006233b5e3a3fe507d62642377b5dc2e |
|
11-Nov-2011 |
Selim Gurun <sgurun@google.com> |
Backport SPDY ping changes from chrome 16.
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>
/external/chromium/net/spdy/spdy_session.cc
|
| 0efa6ab29775a30b185e842c74a1f0511252ef66 |
|
05-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Fix conflicts in spdy_session.cc
Local change close to upstream edit:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/spdy/spdy_session.cc?view=diff&pathrev=88489&r1=81148&r2=81149
Change-Id: I0c888c3cb92ac7f63553adc9d0202218088e5824
/external/chromium/net/spdy/spdy_session.cc
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/net/spdy/spdy_session.cc
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/net/spdy/spdy_session.cc
|
| fd1998388c6e6e45dfaf3d6bd71d9fba541b0c43 |
|
15-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge changes I36d92007,I667a6803,Ia6df2c26,I68425903,I3ed7374e,Icc88f69e,Ifa32ffeb,I2819b8a4,I0267206e,I4fbbef3c,Ic2f68044,Idcad89f5,Ia2d53e01,Ifd158f1a,I13ae0d97,Ie63b95f5,Icbc82026,I9547a3c8,I55c66cce,I39c1e29e,Ibfb86a74,I8a0c21f6,I3c06547e,I9b689dfe,I8b4aaf61,I5ee38228,Iee92f225
* changes:
Remove guards for upstreamed change
Merge Chromium at r11.0.672.0: Compile fixes in pref_service.cc
Merge Chromium at r11.0.672.0: Compile fix in autofill_manager.*
Merge Chromium at r11.0.672.0: Compile fix in profile_android.h
Merge Chromium at r11.0.672.0: Compile fix in android_url_request_context_getter.*
Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.cc
Merge Chromium at r11.0.672.0: Compile fix in android_network_library.cc
Merge Chromium at r11.0.672.0: Compile fix in url_fetcher_proxy.h
Merge Chromium at r11.0.672.0: Files moved upstream
Merge Chromium at r11.0.672.0: Fix Makefiles.
Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.cc
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.cc
Merge Chromium at r11.0.672.0: Fix conflicts in personal_data_manager.cc
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_manager.*
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.cc
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.h
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.h
Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.cc
Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.cc
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.cc
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.h
Merge Chromium at r11.0.672.0: Fix conflicts in net_util.cc
Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc
Merge Chromium at r11.0.672.0: Fix conflicts in logging.cc
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Reduce pref usage by autofill
File not used, matching upstream to avoid conflicts.
|
| 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/net/spdy/spdy_session.cc
|
| 7c9f4088c168b2d83397a224c05dd7be87720317 |
|
14-Jun-2011 |
Russell Brenner <russellbrenner@google.com> |
Add a null pointer check in ApplyCwndFieldTrial
Find("SpdyCwnd") is sometimes coming back null. This guards against
that case.
http://codereview.chromium.org/6877124/
Change-Id: Ic6da3c39049397b7e430797a43ab0df30df277d2
/external/chromium/net/spdy/spdy_session.cc
|
| 21d179b334e59e9a3bfcaed4c4430bef1bc5759d |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
/external/chromium/net/spdy/spdy_session.cc
|
| 201ade2fbba22bfb27ae029f4d23fca6ded109a0 |
|
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
/external/chromium/net/spdy/spdy_session.cc
|
| 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
|
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
/external/chromium/net/spdy/spdy_session.cc
|
| 513209b27ff55e2841eac0e4120199c23acce758 |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
/external/chromium/net/spdy/spdy_session.cc
|
| 728c2df562c0363b8a6c676c8a5c01cada24cf9f |
|
09-Nov-2010 |
Iain Merrick <husky@google.com> |
Revert "Merge Chromium at r63472 : Workaround for compiler bug."
This reverts commit 2d2498eb555b4096a63a64dc6afcf2c95ec19f4d.
No longer needed because a compiler fix has been pushed.
Bug: 3164732
/external/chromium/net/spdy/spdy_session.cc
|
| 2d2498eb555b4096a63a64dc6afcf2c95ec19f4d |
|
02-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Workaround for compiler bug.
IN PROGRESS. The compiler generates bad assembly for this file and
I don't know why. There's something it doesn't like about this one
function; splitting it out into a separate file fixes the problem.
Change-Id: I3cad52d7a14d341d16b826c031fd3b2599197b74
/external/chromium/net/spdy/spdy_session.cc
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/net/spdy/spdy_session.cc
|
| 3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/net/spdy/spdy_session.cc
|
| c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/net/spdy/spdy_session.cc
|