Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1127)

Unified Diff: net/base/sdch_manager.cc

Issue 816543004: Update from https://crrev.com/308996 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/registry_controlled_domains/effective_tld_names.gperf ('k') | net/base/sdch_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/sdch_manager.cc
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index 1aa9627e2a8be4ab6ec60462b5c6021bd899b4a9..7429149e08065cb57107ffbf949f4bccdeb3b289 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -50,8 +50,14 @@ const size_t SdchManager::kMaxDictionaryCount = 20;
const size_t SdchManager::kMaxDictionarySize = 1000 * 1000;
#endif
+// Workaround for http://crbug.com/437794; remove when fixed.
+#if defined(OS_IOS)
+// static
+bool SdchManager::g_sdch_enabled_ = false;
+#else
// static
bool SdchManager::g_sdch_enabled_ = true;
+#endif
// static
bool SdchManager::g_secure_scheme_supported_ = true;
« no previous file with comments | « net/base/registry_controlled_domains/effective_tld_names.gperf ('k') | net/base/sdch_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698