From 43fe0893edfe68457bfdeb4533d02f55210ad6eb Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Tue, 2 Nov 2010 12:51:09 +0000 Subject: Merge Chromium at r63472 : WebKit fixes. Chromium now uses protocol buffers so we need libprotobuf. See http://src.chromium.org/viewvc/chrome?view=rev&revision=63221 HttpCache takes an extra constructor argument. See http://src.chromium.org/viewvc/chrome?view=rev&revision=61789 Change-Id: I5e78b0de9a8ff86040b13212455eb37a4ed0e39e --- WebKit/android/WebCoreSupport/WebRequestContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebKit/android') diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index aa5311f..d7fa6b8 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -155,7 +155,7 @@ WebRequestContext* WebRequestContext::getContextForPath(const char* cookieFilena // Todo: check if the context takes ownership of the cache net::HttpCache::DefaultBackend* defaultBackend = new net::HttpCache::DefaultBackend(net::DISK_CACHE, cachePath, 20 * 1024 * 1024, cacheMessageLoopProxy); - context->http_transaction_factory_ = new net::HttpCache(context->host_resolver(), net::ProxyService::CreateDirect(), net::SSLConfigService::CreateSystemSSLConfigService(), net::HttpAuthHandlerFactory::CreateDefault(context->host_resolver_), 0, 0, defaultBackend); + context->http_transaction_factory_ = new net::HttpCache(context->host_resolver(), context->dnsrr_resolver(), net::ProxyService::CreateDirect(), net::SSLConfigService::CreateSystemSSLConfigService(), net::HttpAuthHandlerFactory::CreateDefault(context->host_resolver_), 0, 0, defaultBackend); scoped_refptr cookieDb = new SQLitePersistentCookieStore(cookiePath); -- cgit v1.1