diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-27 10:42:57 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 15:12:47 +0100 |
| commit | a186c83571fcc6481a1b6be31eb59ae9d6dfee41 (patch) | |
| tree | 9e7507cd4b52006e782a09d7f53f143c6011e78e /Source | |
| parent | a5b05f64bda3dea3ba23e77e9eb2ef59812cdc86 (diff) | |
| download | external_webkit-a186c83571fcc6481a1b6be31eb59ae9d6dfee41.zip external_webkit-a186c83571fcc6481a1b6be31eb59ae9d6dfee41.tar.gz external_webkit-a186c83571fcc6481a1b6be31eb59ae9d6dfee41.tar.bz2 | |
Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc
Members in UrlRequestContext was made private in:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165
Using setter to set instead of using variable directly.
Change-Id: I1d8b554a1f017d39acbf5ae014e934631c29049b
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp index f51ba53..43f5eb1 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -61,15 +61,15 @@ WebRequestContext::WebRequestContext(bool isPrivateBrowsing) } WebCache* cache = WebCache::get(m_isPrivateBrowsing); - host_resolver_ = cache->hostResolver(); - http_transaction_factory_ = cache->cache(); + set_host_resolver(cache->hostResolver()); + set_http_transaction_factory(cache->cache()); WebCookieJar* cookieJar = WebCookieJar::get(m_isPrivateBrowsing); - cookie_store_ = cookieJar->cookieStore(); - cookie_policy_ = cookieJar; + set_cookie_store(cookieJar->cookieStore()); + set_cookie_policy(cookieJar); // Also hardcoded in FrameLoader.java - accept_charset_ = "utf-8, iso-8859-1, utf-16, *;q=0.7"; + set_accept_charset("utf-8, iso-8859-1, utf-16, *;q=0.7"); } WebRequestContext::~WebRequestContext() |