summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-08-24 02:49:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-24 02:49:01 -0700
commitc952714bc6809a5ad081baaf9fcc04107b92ea3f (patch)
tree6597fef60f8c8dc463c236355bf8c9d8a7fbbd9c /WebKit
parent5a2befd2a4d7ffeffe9693d6d256d21a0f8e24a5 (diff)
parent3b64bab14c4f5154788ec891869fab8db4b35f03 (diff)
downloadexternal_webkit-c952714bc6809a5ad081baaf9fcc04107b92ea3f.zip
external_webkit-c952714bc6809a5ad081baaf9fcc04107b92ea3f.tar.gz
external_webkit-c952714bc6809a5ad081baaf9fcc04107b92ea3f.tar.bz2
Merge "Enable cookies for files."
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/WebRequestContext.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp
index 6b2fe1b..1b7a5ee 100644
--- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp
+++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp
@@ -120,6 +120,10 @@ WebRequestContext* WebRequestContext::GetAndroidContextForPath(const char* cooki
androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), 0, 0, 0, defaultBackend);
scoped_refptr<SQLitePersistentCookieStore> cookieDb = new SQLitePersistentCookieStore(cookiePath);
+
+ // This is needed for the page cycler
+ net::CookieMonster::EnableFileScheme();
+
androidContext->cookie_store_ = new net::CookieMonster(cookieDb.get(), 0);
return androidContext.release();