Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: add a new contextBridge module #20639

Merged
merged 8 commits into from
Oct 21, 2019
Merged

feat: add a new contextBridge module #20639

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
548051b
feat: add a new contextBridge module (#20307)
MarshallOfSound Oct 18, 2019
b98d9da
docs: mark contextBridge as experimental (#20638)
MarshallOfSound Oct 18, 2019
ce2113d
chore: touch up the differences between master and 6-0-x
MarshallOfSound Oct 18, 2019
98af3fe
chore: add v8 serializer converter, cherry picked from 2fad53e66b1a2c…
MarshallOfSound Oct 18, 2019
fa7b4b1
chore: support converting OnceCallback to V8 (#17941)
zcbenz Apr 25, 2019
aef68c4
chore: fixup tests
MarshallOfSound Oct 18, 2019
8cfd7d1
chore: fix linting
MarshallOfSound Oct 18, 2019
1689cd8
chore: add patch for mojo message constructor
MarshallOfSound Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions atom/common/node_bindings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
V(atom_common_screen) \
V(atom_common_shell) \
V(atom_common_v8_util) \
V(atom_renderer_context_bridge) \
V(atom_renderer_ipc) \
V(atom_renderer_web_frame)

Expand Down
10 changes: 10 additions & 0 deletions atom/common/promise_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ class Promise {
return GetInner()->Reject(GetContext(), v8::Undefined(isolate()));
}

v8::Maybe<bool> Reject(v8::Local<v8::Value> exception) {
v8::HandleScope handle_scope(isolate());
v8::MicrotasksScope script_scope(isolate(),
v8::MicrotasksScope::kRunMicrotasks);
v8::Context::Scope context_scope(
v8::Local<v8::Context>::New(isolate(), GetContext()));

return GetInner()->Reject(GetContext(), exception);
}

// Please note that using Then is effectively the same as calling .then
// in javascript. This means (a) it is not type safe and (b) please note
// it is NOT type safe.
Expand Down