summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-28 10:13:57 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-02 18:09:04 +0000
commitf89ded9f17a59ca1ffe4d8711c0af4d54489e105 (patch)
tree113337ceb078215fc02850a8a5d8fc876e6fada8
parent1fae7d725a5f51a1def0be614d503686664f2128 (diff)
Update Chromiumv5.12.0-beta1
Changes: 8e6f5751e5 Restore media::FFmpegGlue::InitializeFFmpeg() 0c8d188f16 Add x86 target support for gn 2a52817b6e Fix creation of 'x86' toolchain in gn 3a84c2a8bc Add support for modules limiting jumbo width c69fdae9c7 BASELINE: Update Chromium to 69.0.3497.113 3a783ba38b Merge remote-tracking branch 'origin/upstream-master' into 69-based a4ecaddc7c Remove missing symlink to gen from perfetto/ui/src 3f8994c671 [Backport] Use newer GrGLFunction based on templated function types rather than pointers. Change-Id: Ibfe810c1c9b88e25e9093fbb2aa213249f1a77bf Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
m---------src/3rdparty0
-rw-r--r--src/core/net/network_delegate_qt.cpp5
-rw-r--r--src/core/net/network_delegate_qt.h4
-rw-r--r--tools/scripts/version_resolver.py2
4 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 0ba5e6626ae4aff6f32140b810e7650a1018107
+Subproject 3f8994c671d1cfc674ab64e118304b897a84762
diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp
index 88ab1238..ccc8cc0e 100644
--- a/src/core/net/network_delegate_qt.cpp
+++ b/src/core/net/network_delegate_qt.cpp
@@ -281,13 +281,12 @@ void NetworkDelegateQt::OnCompleted(net::URLRequest */*request*/, bool /*started
bool NetworkDelegateQt::OnCanSetCookie(const net::URLRequest& request,
const net::CanonicalCookie & /*cookie*/,
- net::CookieOptions*,
- bool /*allowed_from_caller*/)
+ net::CookieOptions*)
{
return canSetCookies(request.site_for_cookies(), request.url(), std::string());
}
-bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest& request, const net::CookieList&, bool /*allowed_from_caller*/)
+bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest& request, const net::CookieList&)
{
return canGetCookies(request.site_for_cookies(), request.url());
}
diff --git a/src/core/net/network_delegate_qt.h b/src/core/net/network_delegate_qt.h
index ac89b128..e4ff196a 100644
--- a/src/core/net/network_delegate_qt.h
+++ b/src/core/net/network_delegate_qt.h
@@ -62,7 +62,7 @@ public:
// net::NetworkDelegate implementation
int OnBeforeURLRequest(net::URLRequest* request, net::CompletionOnceCallback callback, GURL* new_url) override;
void OnURLRequestDestroyed(net::URLRequest* request) override;
- bool OnCanSetCookie(const net::URLRequest& request, const net::CanonicalCookie& cookie, net::CookieOptions* options, bool allowed_from_caller) override;
+ bool OnCanSetCookie(const net::URLRequest& request, const net::CanonicalCookie& cookie, net::CookieOptions* options) override;
int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionOnceCallback callback, net::HttpRequestHeaders *headers) override;
void OnBeforeSendHeaders(net::URLRequest* request, const net::ProxyInfo& proxy_info,
const net::ProxyRetryInfoMap& proxy_retry_info, net::HttpRequestHeaders* headers) override;
@@ -75,7 +75,7 @@ public:
void OnCompleted(net::URLRequest *request, bool started, int net_error) override;
void OnPACScriptError(int, const base::string16&) override;
net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, AuthCallback, net::AuthCredentials*) override;
- bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&, bool allowed_from_caller) override;
+ bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
bool OnCanAccessFile(const net::URLRequest&, const base::FilePath&, const base::FilePath&) const override;
bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
bool OnAreExperimentalCookieFeaturesEnabled() const override;
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 5482add6..27062fbc 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,7 +38,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '69.0.3497.70'
+chromium_version = '69.0.3497.113'
chromium_branch = '3497'
ninja_version = 'v1.8.2'