mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Speculative fix for crashes related to CookieStoreProxy on Windows (issue #591).
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@615 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -176,7 +176,7 @@ class CefUrlRequestJob : public net::URLRequestJob {
|
|||||||
if (!request_)
|
if (!request_)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
net::CookieStore* cookie_store =
|
scoped_refptr<net::CookieStore> cookie_store =
|
||||||
request_->context()->cookie_store();
|
request_->context()->cookie_store();
|
||||||
if (cookie_store) {
|
if (cookie_store) {
|
||||||
net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster();
|
net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster();
|
||||||
@ -196,10 +196,14 @@ class CefUrlRequestJob : public net::URLRequestJob {
|
|||||||
void DoLoadCookies() {
|
void DoLoadCookies() {
|
||||||
net::CookieOptions options;
|
net::CookieOptions options;
|
||||||
options.set_include_httponly();
|
options.set_include_httponly();
|
||||||
request_->context()->cookie_store()->GetCookiesWithInfoAsync(
|
scoped_refptr<net::CookieStore> cookie_store =
|
||||||
request_->url(), options,
|
request_->context()->cookie_store();
|
||||||
base::Bind(&CefUrlRequestJob::OnCookiesLoaded,
|
if (cookie_store) {
|
||||||
weak_factory_.GetWeakPtr()));
|
cookie_store->GetCookiesWithInfoAsync(
|
||||||
|
request_->url(), options,
|
||||||
|
base::Bind(&CefUrlRequestJob::OnCookiesLoaded,
|
||||||
|
weak_factory_.GetWeakPtr()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckCookiePolicyAndLoad(
|
void CheckCookiePolicyAndLoad(
|
||||||
@ -414,10 +418,14 @@ class CefUrlRequestJob : public net::URLRequestJob {
|
|||||||
options.set_include_httponly();
|
options.set_include_httponly();
|
||||||
if (CanSetCookie(
|
if (CanSetCookie(
|
||||||
response_cookies_[response_cookies_save_index_], &options)) {
|
response_cookies_[response_cookies_save_index_], &options)) {
|
||||||
request_->context()->cookie_store()->SetCookieWithOptionsAsync(
|
scoped_refptr<net::CookieStore> cookie_store =
|
||||||
request_->url(), response_cookies_[response_cookies_save_index_],
|
request_->context()->cookie_store();
|
||||||
options, base::Bind(&CefUrlRequestJob::OnCookieSaved,
|
if (cookie_store) {
|
||||||
weak_factory_.GetWeakPtr()));
|
cookie_store->SetCookieWithOptionsAsync(
|
||||||
|
request_->url(), response_cookies_[response_cookies_save_index_],
|
||||||
|
options, base::Bind(&CefUrlRequestJob::OnCookieSaved,
|
||||||
|
weak_factory_.GetWeakPtr()));
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user