-
Notifications
You must be signed in to change notification settings - Fork 15k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: upgrade to Chromium 70.0.3538.110 #15405
Conversation
5591391
to
0510774
Compare
36b7c62
to
faa465b
Compare
3bcb7c1
to
d123726
Compare
BUILD.gn
Outdated
@@ -398,6 +398,7 @@ static_library("electron_lib") { | |||
} | |||
if (is_win) { | |||
libs += [ "dwmapi.lib" ] | |||
cflags = [ "-Wno-microsoft-include" ] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is a problem with node's headers, then this flag should go in the node GN files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nornagon I tried that, it didn't help. The issue comes from Electron including a node header which then causes this error rather than the node build itself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what public_configs
is for in GN.
// FIXME(deepak1556): This is just a hack to force | ||
// creation of request context which in turn initializes | ||
// the network context, can be removed with network | ||
// service enabled. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems concerning, and I don't see a card for it on https://github.com/orgs/electron/projects/25. Is this something that users will have to do to make proxies work correctly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have created https://github.com/orgs/electron/projects/25#card-15285452 to track it, this only affects when users create a session and doesn't access any network apis, instead directly use the proxy apis which requires a network context initialized. Its a given disadvantage from gluing legacy network code with new network service apis, will fix this after merge.
(*out)->AppendBytes(bytes->GetBlob().data(), bytes->GetBlob().size()); | ||
(*out)->AppendBytes( | ||
reinterpret_cast<const char*>(bytes->GetBlob().data()), | ||
base::checked_cast<int>(bytes->GetBlob().size())); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this potentially be
(*out)->AppendBytes(bytes->GetBlob());
bytes->GetBlob()
is of type BlobStorage
which is defined as std::vector<uint8_t>
here: https://chromium.googlesource.com/chromium/src/+/70.0.3538.109/base/values.h#83, and AppendBytes
takes a std::vector<char>
...
@@ -221,8 +222,11 @@ void AtomRendererClient::SetupMainWorldOverrides( | |||
dict.Set(options::kNativeWindowOpen, | |||
command_line->HasSwitch(switches::kNativeWindowOpen)); | |||
|
|||
v8::Local<v8::Value> args[] = {binding}; | |||
ignore_result(func->Call(context, v8::Null(isolate), 1, args)); | |||
if (result->IsFunction()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In what situation would result
not be a function? Perhaps we should CHECK
here?
if (maybe_script.ToLocal(&script)) | ||
result = script->Run(context).ToLocalChecked(); | ||
|
||
if (result->IsFunction()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CHECK
might be more appropriate than if
here
v8::Local<v8::Script> script; | ||
v8::Local<v8::Value> result; | ||
if (maybe_script.ToLocal(&script)) | ||
result = script->Run(context).ToLocalChecked(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps this logic could be refactored to reuse the logic in CreatePreloadScript
?
d123726
to
ad6799d
Compare
ad6799d
to
7f1c753
Compare
@nornagon have rebased and addressed your comments. Can you review again, thanks! |
@@ -278,4 +277,14 @@ v8::Local<v8::Context> RendererClientBase::GetContext( | |||
return frame->MainWorldScriptContext(); | |||
} | |||
|
|||
v8::Local<v8::Value> RendererClientBase::RunScript( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
v8::Local<v8::Value> RendererClientBase::RunScript( | |
// static | |
v8::Local<v8::Value> RendererClientBase::RunScript( |
It is enabled by default now.
2a28542
to
8ec3bc0
Compare
Release Notes Persisted
|
Description of Change
Upgrade to Chromium 70.0.3538.110
BREAKING CHANGE
Board https://github.com/orgs/electron/projects/25
Build Checklist
Tests Checklist
Release Notes
Notes: Upgrade to Chromium 70.0.3538.79