diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-13 16:50:35 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-20 16:28:09 +0100 |
| commit | 13cce8a43dd90bd4eec763fbdacb551929cf68c0 (patch) | |
| tree | bb317cc21a20851f249f90820cd180527c371b0f /Source | |
| parent | e76f99d730137b02cb24a8b723fc7526ffe03773 (diff) | |
| download | external_webkit-13cce8a43dd90bd4eec763fbdacb551929cf68c0.zip external_webkit-13cce8a43dd90bd4eec763fbdacb551929cf68c0.tar.gz external_webkit-13cce8a43dd90bd4eec763fbdacb551929cf68c0.tar.bz2 | |
Merge Chromium at 10.0.621.0: New argument in the Cache CTOR
Create a default one as it will crash if set to NULL.
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: Ic22277a95f3cbdb1fa0b6ac65b01f835fb4a407e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | 1 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCache.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 236b93b..bea78eb 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -58,6 +58,7 @@ #include <base/tuple.h> #include <chrome/browser/net/sqlite_persistent_cookie_store.h> #include <net/base/auth.h> +#include <net/base/cert_verifier.h> #include <net/base/cookie_monster.h> #include <net/base/cookie_policy.h> #include <net/base/data_url.h> diff --git a/Source/WebKit/android/WebCoreSupport/WebCache.cpp b/Source/WebKit/android/WebCoreSupport/WebCache.cpp index be9a700..a15bf7f 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCache.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebCache.cpp @@ -116,6 +116,7 @@ WebCache::WebCache(bool isPrivateBrowsing) } m_cache = new net::HttpCache(m_hostResolver.get(), + new CertVerifier(), 0, // dnsrr_resolver 0, // dns_cert_checker net::ProxyService::CreateWithoutProxyResolver(m_proxyConfigService, 0 /* net_log */), |