diff options
author | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 19:54:15 +0000 |
---|---|---|
committer | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 19:54:15 +0000 |
commit | b06612fa2e390c0727393f03863186ab6d01a1c8 (patch) | |
tree | f1e28ca41305e47f93db6d2371ca66837d2a8bdd /chrome/browser/net/chrome_url_request_context.cc | |
parent | d97a5648e02296e7865d3626945494a17e003497 (diff) | |
download | chromium_src-b06612fa2e390c0727393f03863186ab6d01a1c8.zip chromium_src-b06612fa2e390c0727393f03863186ab6d01a1c8.tar.gz chromium_src-b06612fa2e390c0727393f03863186ab6d01a1c8.tar.bz2 |
Blacklist API change for allowing multiple rule matches
The findMatch function now returns a Match object which aggregates multiple
entries into one, in case (which is expected to be common) that multiple
rules match a given URL.
Since the set of matches is highly dependent on the URL, the Match class
replaces the old RequestData object to be added to URLRequests.
BUG=16932
TEST=Blacklist*
Review URL: http://codereview.chromium.org/149737
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
-rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 3668328..1b33919 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -391,13 +391,12 @@ bool ChromeURLRequestContext::interceptCookie(const URLRequest* request, const URLRequest::UserData* d = request->GetUserData((void*)&Blacklist::kRequestDataKey); if (d) { - const Blacklist::Entry* entry = - static_cast<const Blacklist::RequestData*>(d)->entry(); - if (entry->attributes() & Blacklist::kDontStoreCookies) { + const Blacklist::Match* match = static_cast<const Blacklist::Match*>(d); + if (match->attributes() & Blacklist::kDontStoreCookies) { cookie->clear(); return false; } - if (entry->attributes() & Blacklist::kDontPersistCookies) { + if (match->attributes() & Blacklist::kDontPersistCookies) { *cookie = Blacklist::StripCookieExpiry(*cookie); } } @@ -409,9 +408,8 @@ bool ChromeURLRequestContext::allowSendingCookies(const URLRequest* request) const URLRequest::UserData* d = request->GetUserData((void*)&Blacklist::kRequestDataKey); if (d) { - const Blacklist::Entry* entry = - static_cast<const Blacklist::RequestData*>(d)->entry(); - if (entry->attributes() & Blacklist::kDontSendCookies) + const Blacklist::Match* match = static_cast<const Blacklist::Match*>(d); + if (match->attributes() & Blacklist::kDontSendCookies) return false; } return true; |