diff options
| author | Selim Gurun <sgurun@google.com> | 2011-11-11 14:29:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-11 14:29:33 -0800 |
| commit | 7c2e38b61270efe55f065d765228ace66b54f169 (patch) | |
| tree | 9ecf452fe48f39841b8ba2a5061f932360a26b65 /Source | |
| parent | e5c39206de45588678bf718a8274432068d702f6 (diff) | |
| parent | 1a6477bbf7ad0c8b6a4859395d87006f57a7bf0a (diff) | |
| download | external_webkit-7c2e38b61270efe55f065d765228ace66b54f169.zip external_webkit-7c2e38b61270efe55f065d765228ace66b54f169.tar.gz external_webkit-7c2e38b61270efe55f065d765228ace66b54f169.tar.bz2 | |
Merge "Enable SPDY protocol." into ics-mr1
Diffstat (limited to 'Source')
| -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()); } |