diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 10:07:07 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 18:54:49 +0200 |
commit | a3c77682ce67420ac3fba4d81847bbe170b387eb (patch) | |
tree | c22938dae751405e5f78881a7683ab3176c77a5c /src/core/net/proxying_restricted_cookie_manager_qt.cpp | |
parent | d3882688a8fd70ccd4c42afd2485c3b5d3810547 (diff) | |
parent | 1c6d01b846f2152e7215c98cfa09e668c880da7e (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/3rdparty
src/core/certificate_error_controller.cpp
src/core/certificate_error_controller.h
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
src/core/compositor/display_gl_output_surface.cpp
src/core/content_browser_client_qt.cpp
src/core/core_chromium.pri
src/core/delegated_frame_host_client_qt.cpp
src/core/ozone/gl_share_context_qt.h
src/core/ozone/surface_factory_qt.cpp
src/core/permission_manager_qt.cpp
src/core/render_widget_host_view_qt.cpp
src/core/render_widget_host_view_qt.h
src/core/web_engine_context.cpp
src/core/web_engine_settings.cpp
src/core/web_event_factory.cpp
tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669
Diffstat (limited to 'src/core/net/proxying_restricted_cookie_manager_qt.cpp')
-rw-r--r-- | src/core/net/proxying_restricted_cookie_manager_qt.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/net/proxying_restricted_cookie_manager_qt.cpp b/src/core/net/proxying_restricted_cookie_manager_qt.cpp index 331b55e62..b0b46c817 100644 --- a/src/core/net/proxying_restricted_cookie_manager_qt.cpp +++ b/src/core/net/proxying_restricted_cookie_manager_qt.cpp @@ -116,7 +116,7 @@ ProxyingRestrictedCookieManagerQt::~ProxyingRestrictedCookieManagerQt() } void ProxyingRestrictedCookieManagerQt::GetAllForUrl(const GURL &url, - const GURL &site_for_cookies, + const net::SiteForCookies &site_for_cookies, const url::Origin &top_frame_origin, network::mojom::CookieManagerGetOptionsPtr options, GetAllForUrlCallback callback) @@ -132,7 +132,8 @@ void ProxyingRestrictedCookieManagerQt::GetAllForUrl(const GURL &url, void ProxyingRestrictedCookieManagerQt::SetCanonicalCookie(const net::CanonicalCookie &cookie, const GURL &url, - const GURL &site_for_cookies, const url::Origin &top_frame_origin, + const net::SiteForCookies &site_for_cookies, + const url::Origin &top_frame_origin, SetCanonicalCookieCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); @@ -145,7 +146,7 @@ void ProxyingRestrictedCookieManagerQt::SetCanonicalCookie(const net::CanonicalC } void ProxyingRestrictedCookieManagerQt::AddChangeListener(const GURL &url, - const GURL &site_for_cookies, + const net::SiteForCookies &site_for_cookies, const url::Origin &top_frame_origin, mojo::PendingRemote<network::mojom::CookieChangeListener> listener, AddChangeListenerCallback callback) @@ -155,7 +156,7 @@ void ProxyingRestrictedCookieManagerQt::AddChangeListener(const GURL &url, } void ProxyingRestrictedCookieManagerQt::SetCookieFromString(const GURL &url, - const GURL &site_for_cookies, + const net::SiteForCookies &site_for_cookies, const url::Origin &top_frame_origin, const std::string &cookie, SetCookieFromStringCallback callback) @@ -170,7 +171,7 @@ void ProxyingRestrictedCookieManagerQt::SetCookieFromString(const GURL &url, } void ProxyingRestrictedCookieManagerQt::GetCookiesString(const GURL &url, - const GURL &site_for_cookies, + const net::SiteForCookies &site_for_cookies, const url::Origin &top_frame_origin, GetCookiesStringCallback callback) { @@ -184,7 +185,7 @@ void ProxyingRestrictedCookieManagerQt::GetCookiesString(const GURL &url, } void ProxyingRestrictedCookieManagerQt::CookiesEnabledFor(const GURL &url, - const GURL &site_for_cookies, + const net::SiteForCookies &site_for_cookies, const url::Origin & /*top_frame_origin*/, CookiesEnabledForCallback callback) { @@ -192,11 +193,11 @@ void ProxyingRestrictedCookieManagerQt::CookiesEnabledFor(const GURL &url, std::move(callback).Run(allowCookies(url, site_for_cookies)); } -bool ProxyingRestrictedCookieManagerQt::allowCookies(const GURL &url, const GURL &site_for_cookies) const +bool ProxyingRestrictedCookieManagerQt::allowCookies(const GURL &url, const net::SiteForCookies &site_for_cookies) const { if (!m_profileIoData) return false; - return m_profileIoData->canGetCookies(toQt(site_for_cookies), toQt(url)); + return m_profileIoData->canGetCookies(toQt(site_for_cookies.RepresentativeUrl()), toQt(url)); } } // namespace QtWebEngineCore |