Skip to content

Commit da53451

Browse files
magreenblattmagreenblatt
committed
Update to Chromium version 71.0.3567.0 (#595360)
- Configuration of OSR VSync interval is currently missing (issue #2517) - Rename VERSION to VERSION.in to fix libc++ compile error (issue #2518)
1 parent a2bf177 commit da53451

File tree

110 files changed

+836
-879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+836
-879
lines changed

‎BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if (is_mac) {
173173
[ rebase_path("//cef", root_build_dir) ],
174174
"trim string", [])
175175

176-
cef_version_file = "//cef/VERSION"
176+
cef_version_file = "//cef/VERSION.in"
177177

178178
# The tweak_info_plist.py script requires a version number with 4 parts. CEF
179179
# uses a version number with 3 parts so just set the last part to 0.
@@ -679,7 +679,7 @@ static_library("libcef_static") {
679679
"//components/printing/renderer",
680680
"//components/safe_browsing/db:test_database_manager",
681681
"//components/services/pdf_compositor:pdf_compositor_manifest",
682-
"//components/services/pdf_compositor/public/cpp:utils",
682+
"//components/services/pdf_compositor/public/cpp:factory",
683683
"//components/services/pdf_compositor/public/interfaces",
684684
"//components/proxy_config",
685685
"//components/update_client",

‎CHROMIUM_BUILD_COMPATIBILITY.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
88

99
{
10-
'chromium_checkout': 'refs/tags/70.0.3538.0',
10+
'chromium_checkout': 'refs/tags/71.0.3567.0',
1111
}

‎VERSION ‎VERSION.in

File renamed without changes.

‎include/capi/cef_render_handler_capi.h

+10-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// by hand. See the translator.README.txt file in the tools directory for
3434
// more information.
3535
//
36-
// $hash=ef8abd4a01fe1047abc0d2ab1c359704611a60ac$
36+
// $hash=13ef0e12e6fdc3a0be38656c71b913a4eaaab61b$
3737
//
3838

3939
#ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@@ -131,7 +131,8 @@ typedef struct _cef_render_handler_t {
131131
// contains the pixel data for the whole image. |dirtyRects| contains the set
132132
// of rectangles in pixel coordinates that need to be repainted. |buffer| will
133133
// be |width|*|height|*4 bytes in size and represents a BGRA image with an
134-
// upper-left origin.
134+
// upper-left origin. This function is only called when
135+
// cef_window_tInfo::shared_texture_enabled is set to false (0).
135136
///
136137
void(CEF_CALLBACK* on_paint)(struct _cef_render_handler_t* self,
137138
struct _cef_browser_t* browser,
@@ -143,9 +144,13 @@ typedef struct _cef_render_handler_t {
143144
int height);
144145

145146
///
146-
// Called when an view has been rendered to the given shared texture handle.
147-
// Currently, the shared handle represents a D3D11 Texture2D that can be
148-
// accessed with the OpenSharedResource function available from a ID3D11Device
147+
// Called when an element has been rendered to the shared texture handle.
148+
// |type| indicates whether the element is the view or the popup widget.
149+
// |dirtyRects| contains the set of rectangles in pixel coordinates that need
150+
// to be repainted. |shared_handle| is the handle for a D3D11 Texture2D that
151+
// can be accessed via ID3D11Device using the OpenSharedResource function.
152+
// This function is only called when cef_window_tInfo::shared_texture_enabled
153+
// is set to true (1), and is currently only supported on Windows.
149154
///
150155
void(CEF_CALLBACK* on_accelerated_paint)(struct _cef_render_handler_t* self,
151156
struct _cef_browser_t* browser,

‎libcef/browser/browser_context_impl.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "components/visitedlink/browser/visitedlink_event_listener.h"
3535
#include "components/visitedlink/browser/visitedlink_master.h"
3636
#include "components/zoom/zoom_event_manager.h"
37+
#include "content/public/browser/browser_task_traits.h"
3738
#include "content/public/browser/browser_thread.h"
3839
#include "content/public/browser/download_manager.h"
3940
#include "content/public/browser/storage_partition.h"
@@ -284,7 +285,8 @@ void CefBrowserContextImpl::Initialize() {
284285

285286
// Initialize proxy configuration tracker.
286287
pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
287-
GetPrefs(), BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
288+
GetPrefs(),
289+
base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO})));
288290

289291
CefBrowserContext::PostInitialize();
290292

@@ -445,7 +447,7 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
445447
DCHECK(!url_request_getter_.get());
446448

447449
auto io_thread_runner =
448-
content::BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
450+
base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO});
449451

450452
// Initialize the proxy configuration service.
451453
// TODO(cef): Determine if we can use the Chrome/Mojo implementation from

‎libcef/browser/browser_host_impl.cc

+10-10
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include "components/zoom/zoom_controller.h"
5151
#include "content/browser/gpu/compositor_util.h"
5252
#include "content/browser/web_contents/web_contents_impl.h"
53-
#include "content/common/view_messages.h"
53+
#include "content/common/widget_messages.h"
5454
#include "content/public/browser/desktop_media_id.h"
5555
#include "content/public/browser/download_manager.h"
5656
#include "content/public/browser/download_request_utils.h"
@@ -71,7 +71,7 @@
7171
#include "content/public/common/favicon_url.h"
7272
#include "extensions/browser/process_manager.h"
7373
#include "net/base/net_errors.h"
74-
#include "third_party/blink/public/web/web_find_options.h"
74+
#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
7575
#include "ui/events/base_event_utils.h"
7676

7777
#if defined(OS_MACOSX)
@@ -622,7 +622,7 @@ void CefBrowserHostImpl::CloseBrowser(bool force_close) {
622622
if (contents && contents->NeedToFireBeforeUnload()) {
623623
// Will result in a call to BeforeUnloadFired() and, if the close isn't
624624
// canceled, CloseContents().
625-
contents->DispatchBeforeUnload();
625+
contents->DispatchBeforeUnload(false /* auto_cancel */);
626626
} else {
627627
CloseContents(contents);
628628
}
@@ -846,11 +846,11 @@ void CefBrowserHostImpl::Find(int identifier,
846846
else
847847
find_request_id_counter_ = identifier;
848848

849-
blink::WebFindOptions options;
850-
options.forward = forward;
851-
options.match_case = matchCase;
852-
options.find_next = findNext;
853-
web_contents()->Find(identifier, searchText, options);
849+
auto options = blink::mojom::FindOptions::New();
850+
options->forward = forward;
851+
options->match_case = matchCase;
852+
options->find_next = findNext;
853+
web_contents()->Find(identifier, searchText, std::move(options));
854854
} else {
855855
CEF_POST_TASK(CEF_UIT,
856856
base::BindOnce(&CefBrowserHostImpl::Find, this, identifier,
@@ -2566,7 +2566,7 @@ CefBrowserHostImpl::GetJavaScriptDialogManager(content::WebContents* source) {
25662566

25672567
void CefBrowserHostImpl::RunFileChooser(
25682568
content::RenderFrameHost* render_frame_host,
2569-
const content::FileChooserParams& params) {
2569+
const blink::mojom::FileChooserParams& params) {
25702570
EnsureFileDialogManager();
25712571
file_dialog_manager_->RunFileChooser(render_frame_host, params);
25722572
}
@@ -2929,7 +2929,7 @@ void CefBrowserHostImpl::DidUpdateFaviconURL(
29292929
bool CefBrowserHostImpl::OnMessageReceived(const IPC::Message& message) {
29302930
// Handle the cursor message here if mouse cursor change is disabled instead
29312931
// of propegating the message to the normal handler.
2932-
if (message.type() == ViewHostMsg_SetCursor::ID)
2932+
if (message.type() == WidgetHostMsg_SetCursor::ID)
29332933
return IsMouseCursorChangeDisabled();
29342934

29352935
bool handled = true;

‎libcef/browser/browser_host_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
451451
content::JavaScriptDialogManager* GetJavaScriptDialogManager(
452452
content::WebContents* source) override;
453453
void RunFileChooser(content::RenderFrameHost* render_frame_host,
454-
const content::FileChooserParams& params) override;
454+
const blink::mojom::FileChooserParams& params) override;
455455
bool EmbedsFullscreenWidget() const override;
456456
void EnterFullscreenModeForTab(
457457
content::WebContents* web_contents,

‎libcef/browser/browser_urlrequest_impl.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "base/logging.h"
2020
#include "base/message_loop/message_loop.h"
2121
#include "base/strings/string_util.h"
22+
#include "base/task/post_task.h"
23+
#include "content/public/browser/browser_task_traits.h"
2224
#include "content/public/browser/browser_thread.h"
2325
#include "net/base/io_buffer.h"
2426
#include "net/base/net_errors.h"
@@ -173,8 +175,8 @@ class CefBrowserURLRequest::Context
173175
return false;
174176
}
175177

176-
BrowserThread::PostTaskAndReply(
177-
BrowserThread::UI, FROM_HERE,
178+
base::PostTaskWithTraitsAndReply(
179+
FROM_HERE, {BrowserThread::UI},
178180
base::Bind(&CefBrowserURLRequest::Context::GetRequestContextOnUIThread,
179181
this),
180182
base::Bind(&CefBrowserURLRequest::Context::ContinueOnOriginatingThread,

‎libcef/browser/chrome_profile_stub.cc

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
#include "libcef/browser/chrome_profile_stub.h"
77

8+
#include "content/public/browser/resource_context.h"
9+
#include "net/url_request/url_request_context.h"
10+
811
ChromeProfileStub::ChromeProfileStub() {}
912

1013
ChromeProfileStub::~ChromeProfileStub() {}
@@ -53,7 +56,6 @@ bool ChromeProfileStub::IsChild() const {
5356
}
5457

5558
bool ChromeProfileStub::IsLegacySupervised() const {
56-
NOTREACHED();
5759
return false;
5860
}
5961

@@ -68,11 +70,13 @@ PrefService* ChromeProfileStub::GetOffTheRecordPrefs() {
6870
return NULL;
6971
}
7072

71-
net::URLRequestContextGetter*
72-
ChromeProfileStub::GetRequestContextForExtensions() {
73-
// TODO(cef): Consider creating a separate context for extensions to match
74-
// Chrome behavior.
75-
return GetRequestContext();
73+
base::OnceCallback<net::CookieStore*()>
74+
ChromeProfileStub::GetExtensionsCookieStoreGetter() {
75+
return base::BindOnce(
76+
[](content::ResourceContext* context) {
77+
return context->GetRequestContext()->cookie_store();
78+
},
79+
GetResourceContext());
7680
}
7781

7882
bool ChromeProfileStub::IsSameProfile(Profile* profile) {
@@ -95,11 +99,6 @@ void ChromeProfileStub::set_last_selected_directory(
9599
NOTREACHED();
96100
}
97101

98-
chrome_browser_net::Predictor* ChromeProfileStub::GetNetworkPredictor() {
99-
NOTREACHED();
100-
return NULL;
101-
}
102-
103102
GURL ChromeProfileStub::GetHomePage() {
104103
NOTREACHED();
105104
return GURL();

‎libcef/browser/chrome_profile_stub.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class ChromeProfileStub : public Profile {
3333
bool IsLegacySupervised() const override;
3434
ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
3535
PrefService* GetOffTheRecordPrefs() override;
36-
net::URLRequestContextGetter* GetRequestContextForExtensions() override;
36+
base::OnceCallback<net::CookieStore*()> GetExtensionsCookieStoreGetter()
37+
override;
3738
bool IsSameProfile(Profile* profile) override;
3839
base::Time GetStartTime() const override;
3940
base::FilePath last_selected_directory() override;
4041
void set_last_selected_directory(const base::FilePath& path) override;
41-
chrome_browser_net::Predictor* GetNetworkPredictor() override;
4242
GURL GetHomePage() override;
4343
bool WasCreatedByVersionOrLater(const std::string& version) override;
4444
void SetExitType(ExitType exit_type) override;

‎libcef/browser/content_browser_client.cc

+10-5
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
#include "services/service_manager/sandbox/switches.h"
9494
#include "storage/browser/quota/quota_settings.h"
9595
#include "third_party/blink/public/web/web_window_features.h"
96+
#include "third_party/widevine/cdm/buildflags.h"
9697
#include "ui/base/l10n/l10n_util.h"
9798
#include "ui/base/resource/resource_bundle.h"
9899
#include "ui/base/ui_base_switches.h"
@@ -739,7 +740,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
739740
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
740741
arraysize(kSwitchNames));
741742

742-
#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
743+
#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
743744
if (!browser_cmd->HasSwitch(service_manager::switches::kNoSandbox)) {
744745
// Pass the Widevine CDM path to the Zygote process. See comments in
745746
// CefWidevineLoader::AddContentDecryptionModules.
@@ -1085,16 +1086,20 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory(
10851086
content::BrowserContext* browser_context,
10861087
content::RenderFrameHost* frame,
10871088
bool is_navigation,
1088-
const GURL& url,
1089-
network::mojom::URLLoaderFactoryRequest* factory_request) {
1089+
const url::Origin& request_initiator,
1090+
network::mojom::URLLoaderFactoryRequest* factory_request,
1091+
bool* bypass_redirect_checks) {
10901092
if (!extensions::ExtensionsEnabled())
10911093
return false;
10921094

10931095
auto* web_request_api =
10941096
extensions::BrowserContextKeyedAPIFactory<extensions::WebRequestAPI>::Get(
10951097
browser_context);
1096-
return web_request_api->MaybeProxyURLLoaderFactory(frame, is_navigation,
1097-
factory_request);
1098+
bool use_proxy = web_request_api->MaybeProxyURLLoaderFactory(
1099+
frame, is_navigation, factory_request);
1100+
if (bypass_redirect_checks)
1101+
*bypass_redirect_checks = use_proxy;
1102+
return use_proxy;
10981103
}
10991104

11001105
bool CefContentBrowserClient::HandleExternalProtocol(

‎libcef/browser/content_browser_client.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
142142
content::BrowserContext* browser_context,
143143
content::RenderFrameHost* frame,
144144
bool is_navigation,
145-
const GURL& url,
146-
network::mojom::URLLoaderFactoryRequest* factory_request) override;
145+
const url::Origin& request_initiator,
146+
network::mojom::URLLoaderFactoryRequest* factory_request,
147+
bool* bypass_redirect_checks) override;
147148

148149
bool HandleExternalProtocol(
149150
const GURL& url,

‎libcef/browser/context.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ void CefContext::OnContextInitialized() {
515515
static_cast<ChromeBrowserProcessStub*>(g_browser_process)
516516
->OnContextInitialized();
517517

518-
#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
518+
#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
519519
CefWidevineLoader::GetInstance()->OnContextInitialized();
520520
#endif
521521

0 commit comments

Comments
 (0)