Skip to content

Commit 2616911

Browse files
electron-botnornagon
electron-bot
authored and
nornagon
committed
chore: bump chromium to 7dff37844cb3 (master) (electron#18059)
1 parent 0035854 commit 2616911

File tree

77 files changed

+1636
-294
lines changed

Some content is hidden

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

77 files changed

+1636
-294
lines changed

‎BUILD.gn‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,7 @@ template("dist_zip") {
10691069
"deps",
10701070
"data_deps",
10711071
"data",
1072+
"testonly",
10721073
])
10731074
write_runtime_deps = _runtime_deps_file
10741075
}
@@ -1078,7 +1079,11 @@ template("dist_zip") {
10781079
deps = [
10791080
":$_runtime_deps_target",
10801081
]
1081-
forward_variables_from(invoker, [ "outputs" ])
1082+
forward_variables_from(invoker,
1083+
[
1084+
"outputs",
1085+
"testonly",
1086+
])
10821087
args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
10831088
target_cpu,
10841089
target_os,
@@ -1146,6 +1151,7 @@ dist_zip("electron_ffmpeg_zip") {
11461151
}
11471152

11481153
dist_zip("electron_chromedriver_zip") {
1154+
testonly = true
11491155
data_deps = [
11501156
"//chrome/test/chromedriver",
11511157
":licenses",

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gclient_gn_args = [
1010

1111
vars = {
1212
'chromium_version':
13-
'1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f',
13+
'7dff37844cb359ec96a63c4526574ec71138c2ec',
1414
'node_version':
1515
'696d8fb66d6f65fc82869d390e0d2078970b1eb4',
1616

‎atom/browser/api/atom_api_app.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,9 @@ int ImportIntoCertStore(CertificateManagerModel* model,
530530
}
531531
#endif
532532

533-
void OnIconDataAvailable(util::Promise promise, gfx::Image* icon) {
534-
if (icon && !icon->IsEmpty()) {
535-
promise.Resolve(*icon);
533+
void OnIconDataAvailable(util::Promise promise, gfx::Image icon) {
534+
if (!icon.IsEmpty()) {
535+
promise.Resolve(icon);
536536
} else {
537537
promise.RejectWithErrorMessage("Failed to get file icon.");
538538
}

‎atom/browser/api/atom_api_auto_updater.cc‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,17 @@ void AutoUpdater::OnError(const std::string& message,
6464
auto errorObject =
6565
error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked();
6666

67+
auto context = isolate()->GetCurrentContext();
68+
6769
// add two new params for better error handling
68-
errorObject->Set(mate::StringToV8(isolate(), "code"),
69-
v8::Integer::New(isolate(), code));
70-
errorObject->Set(mate::StringToV8(isolate(), "domain"),
71-
mate::StringToV8(isolate(), domain));
70+
errorObject
71+
->Set(context, mate::StringToV8(isolate(), "code"),
72+
v8::Integer::New(isolate(), code))
73+
.Check();
74+
errorObject
75+
->Set(context, mate::StringToV8(isolate(), "domain"),
76+
mate::StringToV8(isolate(), domain))
77+
.Check();
7278

7379
mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
7480
}

‎atom/browser/api/atom_api_web_contents.cc‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,14 @@ void WebContents::DestroyWebContents(bool async) {
491491
ResetManagedWebContents(async);
492492
}
493493

494-
bool WebContents::DidAddMessageToConsole(content::WebContents* source,
495-
int32_t level,
496-
const base::string16& message,
497-
int32_t line_no,
498-
const base::string16& source_id) {
499-
return Emit("console-message", level, message, line_no, source_id);
494+
bool WebContents::DidAddMessageToConsole(
495+
content::WebContents* source,
496+
blink::mojom::ConsoleMessageLevel level,
497+
const base::string16& message,
498+
int32_t line_no,
499+
const base::string16& source_id) {
500+
return Emit("console-message", static_cast<int32_t>(level), message, line_no,
501+
source_id);
500502
}
501503

502504
void WebContents::OnCreateWindow(

‎atom/browser/api/atom_api_web_contents.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
336336

337337
// content::WebContentsDelegate:
338338
bool DidAddMessageToConsole(content::WebContents* source,
339-
int32_t level,
339+
blink::mojom::ConsoleMessageLevel level,
340340
const base::string16& message,
341341
int32_t line_no,
342342
const base::string16& source_id) override;

‎atom/browser/api/event.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ void Event::FrameDeleted(content::RenderFrameHost* rfh) {
5252
}
5353

5454
void Event::PreventDefault(v8::Isolate* isolate) {
55-
GetWrapper()->Set(StringToV8(isolate, "defaultPrevented"), v8::True(isolate));
55+
GetWrapper()
56+
->Set(isolate->GetCurrentContext(),
57+
StringToV8(isolate, "defaultPrevented"), v8::True(isolate))
58+
.Check();
5659
}
5760

5861
bool Event::SendReply(const base::ListValue& result) {

‎atom/browser/api/event_emitter.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,13 @@ class EventEmitter : public Wrappable<T> {
108108
v8::HandleScope handle_scope(isolate());
109109
EmitEvent(isolate(), GetWrapper(), name, event,
110110
std::forward<Args>(args)...);
111-
return event->Get(StringToV8(isolate(), "defaultPrevented"))
112-
->BooleanValue(isolate());
111+
auto context = isolate()->GetCurrentContext();
112+
v8::Local<v8::Value> defaultPrevented;
113+
if (event->Get(context, StringToV8(isolate(), "defaultPrevented"))
114+
.ToLocal(&defaultPrevented)) {
115+
return defaultPrevented->BooleanValue(isolate());
116+
}
117+
return false;
113118
}
114119

115120
DISALLOW_COPY_AND_ASSIGN(EventEmitter);

‎atom/browser/browser_win.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void Browser::Focus() {
9696
}
9797

9898
void Browser::AddRecentDocument(const base::FilePath& path) {
99-
if (base::win::GetVersion() < base::win::VERSION_WIN7)
99+
if (base::win::GetVersion() < base::win::Version::WIN7)
100100
return;
101101

102102
CComPtr<IShellItem> item;
@@ -346,7 +346,7 @@ std::string Browser::GetExecutableFileProductName() const {
346346

347347
bool Browser::IsEmojiPanelSupported() {
348348
// emoji picker is supported on Windows 10's Spring 2018 update & above.
349-
return base::win::GetVersion() >= base::win::Version::VERSION_WIN10_RS4;
349+
return base::win::GetVersion() >= base::win::Version::WIN10_RS4;
350350
}
351351

352352
void Browser::ShowEmojiPanel() {

‎atom/browser/io_thread.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void IOThread::Init() {
4545

4646
auto cert_verifier = std::make_unique<net::CachingCertVerifier>(
4747
std::make_unique<net::MultiThreadedCertVerifier>(
48-
net::CertVerifyProc::CreateDefault()));
48+
net::CertVerifyProc::CreateDefault(nullptr)));
4949
builder->SetCertVerifier(std::move(cert_verifier));
5050

5151
// Create the network service, so that shared host resolver

0 commit comments

Comments
 (0)