Skip to content

Commit 047e8f9

Browse files
committed
Update to Chromium version 82.0.4085.0 (#749737)
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
1 parent 3d87a68 commit 047e8f9

File tree

99 files changed

+839
-3199
lines changed

Some content is hidden

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

99 files changed

+839
-3199
lines changed

BUILD.gn

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,6 @@ static_library("libcef_static") {
785785
"//components/safe_browsing/core/db:test_database_manager",
786786
"//components/services/print_compositor/public/cpp",
787787
"//components/services/print_compositor/public/mojom",
788-
"//components/tracing",
789788
"//components/update_client",
790789
"//components/url_formatter",
791790
"//components/user_prefs",
@@ -1088,8 +1087,8 @@ static_library("libcef_static") {
10881087
"//ui/aura/test/aura_test_utils.cc",
10891088
"//ui/aura/test/aura_test_utils.h",
10901089
# Part of //ui/events:test_support which is testingonly.
1091-
"//ui/events/test/platform_event_waiter.cc",
1092-
"//ui/events/test/platform_event_waiter.h",
1090+
"//ui/events/test/x11_event_waiter.cc",
1091+
"//ui/events/test/x11_event_waiter.h",
10931092
]
10941093

10951094
if (use_x11) {
@@ -1583,6 +1582,7 @@ if (is_mac) {
15831582
sources = [
15841583
"$root_out_dir/egl_intermediates/libEGL.dylib",
15851584
"$root_out_dir/egl_intermediates/libGLESv2.dylib",
1585+
"$root_out_dir/egl_intermediates/libvulkan.dylib",
15861586
]
15871587
outputs = [
15881588
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
@@ -1597,12 +1597,15 @@ if (is_mac) {
15971597
sources = [
15981598
"$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
15991599
"$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
1600+
"$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
1601+
"$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
16001602
]
16011603
outputs = [
16021604
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
16031605
]
16041606
public_deps = [
1605-
"//ui/gl:swiftshader_library_copy",
1607+
"//ui/gl:swiftshader_egl_library_copy",
1608+
"//ui/gl:swiftshader_vk_library_copy",
16061609
]
16071610
}
16081611
}
@@ -1692,11 +1695,6 @@ if (is_mac) {
16921695
"libcef_dll/libcef_dll.rc",
16931696
]
16941697

1695-
# This is a large module that can't do incremental linking in some cases.
1696-
configs -= [ "//build/config/win:default_incremental_linking" ]
1697-
configs +=
1698-
[ "//build/config/win:default_large_module_incremental_linking" ]
1699-
17001698
deps += [
17011699
# Bring in ui_unscaled_resources.rc which contains custom cursors.
17021700
# TODO(cef): Remove this once custom cursors can be loaded via

CHROMIUM_BUILD_COMPATIBILITY.txt

Lines changed: 1 addition & 1 deletion
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/81.0.4044.0'
10+
'chromium_checkout': 'refs/tags/82.0.4085.0'
1111
}

include/internal/cef_types.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,7 +2237,13 @@ typedef enum {
22372237
CT_ZOOMOUT,
22382238
CT_GRAB,
22392239
CT_GRABBING,
2240+
CT_MIDDLE_PANNING_VERTICAL,
2241+
CT_MIDDLE_PANNING_HORIZONTAL,
22402242
CT_CUSTOM,
2243+
CT_DND_NONE,
2244+
CT_DND_MOVE,
2245+
CT_DND_COPY,
2246+
CT_DND_LINK,
22412247
} cef_cursor_type_t;
22422248

22432249
///

libcef/browser/browser_context.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
#include "extensions/browser/process_manager.h"
4949
#include "extensions/common/constants.h"
5050
#include "net/proxy_resolution/proxy_config_service.h"
51-
#include "net/proxy_resolution/proxy_resolution_service.h"
5251
#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
5352

5453
using content::BrowserThread;

libcef/browser/browser_host_impl.cc

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
#include "chrome/browser/spellchecker/spellcheck_factory.h"
4848
#include "chrome/browser/spellchecker/spellcheck_service.h"
4949
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
50+
#include "components/favicon/core/favicon_url.h"
51+
#include "components/spellcheck/common/spellcheck_features.h"
5052
#include "components/zoom/zoom_controller.h"
5153
#include "content/browser/gpu/compositor_util.h"
5254
#include "content/browser/web_contents/web_contents_impl.h"
@@ -69,7 +71,6 @@
6971
#include "content/public/browser/render_view_host.h"
7072
#include "content/public/browser/render_widget_host.h"
7173
#include "content/public/browser/web_contents.h"
72-
#include "content/public/common/favicon_url.h"
7374
#include "extensions/browser/process_manager.h"
7475
#include "net/base/net_errors.h"
7576
#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
@@ -1056,16 +1057,18 @@ void CefBrowserHostImpl::AddWordToDictionary(const CefString& word) {
10561057
if (!web_contents())
10571058
return;
10581059

1060+
SpellcheckService* spellcheck = nullptr;
10591061
content::BrowserContext* browser_context =
10601062
web_contents()->GetBrowserContext();
10611063
if (browser_context) {
1062-
SpellcheckService* spellcheck =
1063-
SpellcheckServiceFactory::GetForContext(browser_context);
1064+
spellcheck = SpellcheckServiceFactory::GetForContext(browser_context);
10641065
if (spellcheck)
10651066
spellcheck->GetCustomDictionary()->AddWord(word);
10661067
}
10671068
#if defined(OS_MACOSX)
1068-
spellcheck_platform::AddWord(word);
1069+
if (spellcheck && spellcheck::UseBrowserSpellChecker()) {
1070+
spellcheck_platform::AddWord(spellcheck->platform_spell_checker(), word);
1071+
}
10691072
#endif
10701073
}
10711074

@@ -2679,15 +2682,14 @@ void CefBrowserHostImpl::PluginCrashed(const base::FilePath& plugin_path,
26792682
}
26802683

26812684
void CefBrowserHostImpl::DidUpdateFaviconURL(
2682-
const std::vector<content::FaviconURL>& candidates) {
2685+
const std::vector<blink::mojom::FaviconURLPtr>& candidates) {
26832686
if (client_.get()) {
26842687
CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
26852688
if (handler.get()) {
26862689
std::vector<CefString> icon_urls;
2687-
std::vector<content::FaviconURL>::const_iterator it = candidates.begin();
2688-
for (; it != candidates.end(); ++it) {
2689-
if (it->icon_type == content::FaviconURL::IconType::kFavicon)
2690-
icon_urls.push_back(it->icon_url.spec());
2690+
for (const auto& icon : candidates) {
2691+
if (icon->icon_type == blink::mojom::FaviconIconType::kFavicon)
2692+
icon_urls.push_back(icon->icon_url.spec());
26912693
}
26922694
if (!icon_urls.empty())
26932695
handler->OnFaviconURLChange(this, icon_urls);

libcef/browser/browser_host_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
485485
void PluginCrashed(const base::FilePath& plugin_path,
486486
base::ProcessId plugin_pid) override;
487487
void DidUpdateFaviconURL(
488-
const std::vector<content::FaviconURL>& candidates) override;
488+
const std::vector<blink::mojom::FaviconURLPtr>& candidates) override;
489489
bool OnMessageReceived(const IPC::Message& message) override;
490490
bool OnMessageReceived(const IPC::Message& message,
491491
content::RenderFrameHost* render_frame_host) override;

libcef/browser/browser_main.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "extensions/common/constants.h"
3737
#include "net/base/net_module.h"
3838
#include "services/service_manager/embedder/result_codes.h"
39-
#include "ui/base/material_design/material_design_controller.h"
4039
#include "ui/base/resource/resource_bundle.h"
4140

4241
#if defined(USE_AURA) && defined(USE_X11)
@@ -161,8 +160,6 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
161160
display::Screen::SetScreenInstance(views::CreateDesktopScreen());
162161
#endif
163162

164-
ui::MaterialDesignController::Initialize();
165-
166163
if (extensions::ExtensionsEnabled()) {
167164
// Initialize extension global objects before creating the global
168165
// BrowserContext.

libcef/browser/chrome_browser_process_stub.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,8 @@ ChromeBrowserProcessStub::resource_coordinator_parts() {
372372
NOTREACHED();
373373
return nullptr;
374374
}
375+
376+
BuildState* ChromeBrowserProcessStub::GetBuildState() {
377+
NOTREACHED();
378+
return nullptr;
379+
}

libcef/browser/chrome_browser_process_stub.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
9898
resource_coordinator::TabManager* GetTabManager() override;
9999
resource_coordinator::ResourceCoordinatorParts* resource_coordinator_parts()
100100
override;
101+
BuildState* GetBuildState() override;
101102

102103
private:
103104
bool initialized_;

libcef/browser/chrome_profile_stub.cc

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,35 @@
55

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

8+
#include "components/variations/variations_client.h"
9+
#include "components/variations/variations_http_header_provider.h"
810
#include "content/public/browser/resource_context.h"
911
#include "net/url_request/url_request_context.h"
1012

13+
namespace {
14+
15+
class CefVariationsClient : public variations::VariationsClient {
16+
public:
17+
explicit CefVariationsClient(content::BrowserContext* browser_context)
18+
: browser_context_(browser_context) {}
19+
20+
~CefVariationsClient() override = default;
21+
22+
bool IsIncognito() const override {
23+
return browser_context_->IsOffTheRecord();
24+
}
25+
26+
std::string GetVariationsHeader() const override {
27+
return variations::VariationsHttpHeaderProvider::GetInstance()
28+
->GetClientDataHeader(false /* is_signed_in */);
29+
}
30+
31+
private:
32+
content::BrowserContext* browser_context_;
33+
};
34+
35+
} // namespace
36+
1137
ChromeProfileStub::ChromeProfileStub() {}
1238

1339
ChromeProfileStub::~ChromeProfileStub() {}
@@ -20,6 +46,12 @@ bool ChromeProfileStub::IsOffTheRecord() const {
2046
return false;
2147
}
2248

49+
variations::VariationsClient* ChromeProfileStub::GetVariationsClient() {
50+
if (!variations_client_)
51+
variations_client_ = std::make_unique<CefVariationsClient>(this);
52+
return variations_client_.get();
53+
}
54+
2355
scoped_refptr<base::SequencedTaskRunner> ChromeProfileStub::GetIOTaskRunner() {
2456
NOTREACHED();
2557
return scoped_refptr<base::SequencedTaskRunner>();

0 commit comments

Comments
 (0)