bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 85.0.4183.0 (#782793)

Browse Source 
- Windows: 10.0.19041 SDK is now required.
- macOS: 10.15.1 SDK (at least Xcode 11.2) is now required.
- Remove CefMediaSource::IsValid and CefMediaSink::IsValid which would
  always return true.
This commit is contained in:
Marshall Greenblatt
2020-07-08 13:23:29 -04:00
parent 03c9156c80
commit 6573df6cc3
146 changed files with 726 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libcef/browser/net_service/browser_urlrequest_impl.cc
View File

@@ -21,7 +21,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "content/public/browser/global_request_id.h"
#include "content/public/browser/render_frame_host.h"

19
libcef/browser/net_service/cookie_helper.cc
View File

@@ -34,7 +34,7 @@ network::mojom::CookieManager* GetCookieManager(
void ContinueWithLoadedCookies(const AllowCookieCallback& allow_cookie_callback,
DoneCookieCallback done_callback,
const net::CookieStatusList& cookies) {
const net::CookieAccessResultList& cookies) {
CEF_REQUIRE_IOT();
net::CookieList allowed_cookies;
for (const auto& status : cookies) {
@@ -48,8 +48,8 @@ void ContinueWithLoadedCookies(const AllowCookieCallback& allow_cookie_callback,
void GetCookieListCallback(const AllowCookieCallback& allow_cookie_callback,
DoneCookieCallback done_callback,
const net::CookieStatusList& included_cookies,
const net::CookieStatusList&) {
const net::CookieAccessResultList& included_cookies,
const net::CookieAccessResultList&) {
CEF_REQUIRE_UIT();
CEF_POST_TASK(CEF_IOT,
base::BindOnce(ContinueWithLoadedCookies, allow_cookie_callback,
@@ -80,10 +80,9 @@ struct SaveCookiesProgress {
int num_cookie_lines_left_;
};
void SetCanonicalCookieCallback(
SaveCookiesProgress* progress,
const net::CanonicalCookie& cookie,
net::CanonicalCookie::CookieInclusionStatus status) {
void SetCanonicalCookieCallback(SaveCookiesProgress* progress,
const net::CanonicalCookie& cookie,
net::CookieInclusionStatus status) {
CEF_REQUIRE_UIT();
progress->num_cookie_lines_left_--;
if (status.IsInclude()) {
@@ -132,8 +131,8 @@ void SaveCookiesOnUIThread(content::BrowserContext* browser_context,
SetCanonicalCookieCallback(
progress, net::CanonicalCookie(),
net::CanonicalCookie::CookieInclusionStatus(
net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR));
net::CookieInclusionStatus(
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR));
}
} // namespace
@@ -203,7 +202,7 @@ void SaveCookies(content::BrowserContext* browser_context,
while (headers->EnumerateHeader(&iter, name, &cookie_string)) {
total_count++;
net::CanonicalCookie::CookieInclusionStatus returned_status;
net::CookieInclusionStatus returned_status;
std::unique_ptr<net::CanonicalCookie> cookie = net::CanonicalCookie::Create(
request.url, cookie_string, base::Time::Now(),
base::make_optional(response_date), &returned_status);

13
libcef/browser/net_service/cookie_manager_impl.cc
View File

@@ -45,7 +45,7 @@ void RunAsyncCompletionOnUIThread(CefRefPtr<CefCompletionCallback> callback) {
// Always execute the callback asynchronously.
void SetCookieCallbackImpl(CefRefPtr<CefSetCookieCallback> callback,
net::CanonicalCookie::CookieInclusionStatus status) {
net::CookieInclusionStatus status) {
if (!callback.get())
return;
if (!status.IsInclude()) {
@@ -104,8 +104,8 @@ void GetAllCookiesCallbackImpl(
void GetCookiesCallbackImpl(
CefRefPtr<CefCookieVisitor> visitor,
const CefBrowserContext::Getter& browser_context_getter,
const net::CookieStatusList& include_cookies,
const net::CookieStatusList&) {
const net::CookieAccessResultList& include_cookies,
const net::CookieAccessResultList&) {
net::CookieList cookies;
for (const auto& status : include_cookies) {
cookies.push_back(status.cookie);
@@ -259,10 +259,9 @@ bool CefCookieManagerImpl::SetCookie(const CefString& url,
priority);
if (!canonical_cookie) {
SetCookieCallbackImpl(callback,
net::CanonicalCookie::CookieInclusionStatus(
net::CanonicalCookie::CookieInclusionStatus::
EXCLUDE_UNKNOWN_ERROR));
SetCookieCallbackImpl(
callback, net::CookieInclusionStatus(
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR));
return true;
}

5
libcef/browser/net_service/resource_request_handler_wrapper.cc
View File

@@ -20,7 +20,6 @@
#include "libcef/common/response_impl.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
#include "components/language/core/browser/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_context.h"
@@ -98,9 +97,7 @@ std::string GetAcceptLanguageList(content::BrowserContext* browser_context,
// Match the logic in chrome/browser/net/profile_network_context_service.cc.
std::string ComputeAcceptLanguageFromPref(const std::string& language_pref) {
std::string accept_languages_str =
base::FeatureList::IsEnabled(features::kUseNewAcceptLanguageHeader)
? net::HttpUtil::ExpandLanguageList(language_pref)
: language_pref;
net::HttpUtil::ExpandLanguageList(language_pref);
return net::HttpUtil::GenerateAcceptLanguageHeader(accept_languages_str);
}

1
libcef/browser/net_service/response_filter_wrapper.cc
View File

@@ -6,6 +6,7 @@
#include <queue>
#include "base/logging.h"
#include "mojo/public/cpp/system/simple_watcher.h"
#include "mojo/public/cpp/system/string_data_source.h"

1
libcef/browser/net_service/response_filter_wrapper.h
View File

@@ -7,6 +7,7 @@
#include "include/cef_response_filter.h"
#include "base/callback_forward.h"
#include "mojo/public/cpp/system/data_pipe.h"
namespace net_service {