diff options
| author | Selim Gurun <sgurun@google.com> | 2011-11-11 14:34:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 14:34:09 -0800 |
| commit | 347e86423df46e97b374d2b61321e983486f4272 (patch) | |
| tree | b583dc9948e17e3b01f6b8acaf48b2c60babb03b | |
| parent | 566b9cb37411be53220cc0b97f87d3a8abe636dd (diff) | |
| parent | 7c2e38b61270efe55f065d765228ace66b54f169 (diff) | |
| download | external_webkit-347e86423df46e97b374d2b61321e983486f4272.zip external_webkit-347e86423df46e97b374d2b61321e983486f4272.tar.gz external_webkit-347e86423df46e97b374d2b61321e983486f4272.tar.bz2 | |
am 7c2e38b6: Merge "Enable SPDY protocol." into ics-mr1
* commit '7c2e38b61270efe55f065d765228ace66b54f169':
Enable SPDY protocol.
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp index f5029d5..500975c 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp +++ b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp @@ -68,8 +68,7 @@ void initChromium() if (!initCalled) { logging::SetLogMessageHandler(logMessageHandler); networkChangeNotifier.reset(net::NetworkChangeNotifier::Create()); - // Disable SPDY for bug 5226268 [Browser] http keep-alive packets are sent too frequently to network - // net::HttpNetworkLayer::EnableSpdy("npn"); + net::HttpNetworkLayer::EnableSpdy("npn"); initCalled = true; jni::SetJavaVM(JSC::Bindings::getJavaVM()); } |