bd10b19b0c
* chore: bump chromium in DEPS to 97.0.4678.0 * chore: bump chromium in DEPS to 97.0.4679.0 * chore: bump chromium in DEPS to 97.0.4680.0 * chore: bump chromium in DEPS to 97.0.4681.0 * chore: bump chromium in DEPS to 97.0.4682.0 * chore: update patches * 3234737: Disable -Wunused-but-set-variable Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3234737 * 3216953: Reland "Move task-related files from base/ to base/task/" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216953 * 3202710: TimeDelta factory function migration. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3202710 * 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3226841 * 3212165: blink/gin: changes blink to load snapshot based on runtime information Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3212165 * 3220292: Deprecate returning a GURL from GURL::GetOrigin() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3220292 * 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3231995 * 3205121: Remove base::DictionaryValue::GetDouble Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3205121 * 3208413: [flags] Make --js-flags settings have priority over V8 features Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3208413 * chore: bump chromium in DEPS to 97.0.4683.0 * chore: update patches * 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3188834 * chore: update process_singleton patches * chore: bump chromium in DEPS to 97.0.4684.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4685.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4686.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4687.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4688.0 * chore: update patches * 3247722: Use correct source_site_instance if navigating via context menu Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722 Update signature of HandleContextMenu() * 3247722: Use correct source_site_instance if navigating via context menu Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722 Update signature of HandleContextMenu() * 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3223422 sync pepper_plugin_support.patch with upstream * chore: bump chromium in DEPS to 97.0.4689.0 * 3247791: ax_mac_merge: Merge AX Math attribute implementations Xref: ax_mac_merge: Merge AX Math attribute implementations chore: fix minor patch shear in #includes * 3243425: Add VisibleTimeRequestTrigger helper class Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3243425 chore: fix minor patch shear in #includes * chore: regen chromium patches * fixup! 3247722: Use correct source_site_instance if navigating via context menu * chore: bump chromium in DEPS to 97.0.4690.0 * 3188659: Window Placement: make GetScreenInfo(s) const Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3188659 simple sync GetScreenInfo with upstream refactor * chore: update patches * chore: bump chromium in DEPS to 97.0.4690.4 * chore: bump chromium in DEPS to 97.0.4692.0 * 3198073: ozone: //content: clean up from USE_X11 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3198073 Fixing patch shear. Nothing to see here. * 3252338: Remove label images checkbox from chrome://accessibility page Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3252338 Part of our a11y patch is no longer needed due to upstream label removal * 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3258183 Replace our use of the macro with explicitly-deleted class methods. See https://chromium-review.googlesource.com/c/chromium/src/+/3256952 for upstream examples of this same replacement. * chore: update patches * 3247295: Unwind SecurityStyleExplanations Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3247295 update GetSecurityStyle() signature and impl to match upstream changes * 3259578: media: grabs lock to ensure video output when occluded Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3259578 Add stub for new upstream virtual method OnCapturerCountChanged() * fixup! 3247295: Unwind SecurityStyleExplanations * 3238504: Fix up drag image is not shown from bookmark bar Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3238504 SetDragImage() no longer takes a widget argument * 3217452: [devtools] Add getSyncInformation host binding Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3217452 Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled. * chore: bump chromium in DEPS to 98.0.4693.0 * chore: bump chromium in DEPS to 98.0.4694.0 * chore: bump chromium in DEPS to 98.0.4695.0 * chore: bump chromium in DEPS to 98.0.4696.0 * chore: bump chromium in DEPS to 98.0.4697.0 * chore: bump chromium in DEPS to 98.0.4699.0 * chore: bump chromium in DEPS to 98.0.4701.0 * chore: bump chromium in DEPS to 98.0.4703.0 * chore: bump chromium in DEPS to 98.0.4705.0 * chore: bump chromium in DEPS to 98.0.4706.0 * chore: update patches * 3279210: Rename "base/macros.h" => "base/ignore_result.h" https://chromium-review.googlesource.com/c/chromium/src/+/3279210 * 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs https://chromium-review.googlesource.com/c/chromium/src/+/3259964 * 3269029: blink/gin: sets histogram callbacks during isolate creation https://chromium-review.googlesource.com/c/chromium/src/+/3269029 * fixup after rebase * [content] Make ContentMainParams and MainFunctionParams move-only https://chromium-review.googlesource.com/c/chromium/src/+/3244976 * 3255305: Stop sending the securityStateChanged event and unwind https://chromium-review.googlesource.com/c/chromium/src/+/3255305 * [Blink] Add promise support to WebLocalFrame::RequestExecuteScript() https://chromium-review.googlesource.com/c/chromium/src/+/3230010 * 3256162: Simplify RWHV Show and ShowWithVisibility handling https://chromium-review.googlesource.com/c/chromium/src/+/3256162 * 3263824: ozone: //ui/base: clean up from USE_X11 1/* https://chromium-review.googlesource.com/c/chromium/src/+/3263824 * Request or cancel RecordContentToPresentationTimeRequest during capture https://chromium-review.googlesource.com/c/chromium/src/+/3256802 * appcache: remove BrowsingData/quota references https://chromium-review.googlesource.com/c/chromium/src/+/3255725 * [Autofill] Don't show Autofill dropdown if overlaps with permissions https://chromium-review.googlesource.com/c/chromium/src/+/3236729 * Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks https://chromium-review.googlesource.com/c/chromium/src/+/3268574 * cleanup patch * fixup [content] Make ContentMainParams and MainFunctionParams move-only * 3279210: Rename "base/macros.h" => "base/ignore_result.h" https://chromium-review.googlesource.com/c/chromium/src/+/3279210 * ozone: //chrome/browser clean up from USE_X11 https://chromium-review.googlesource.com/c/chromium/src/+/3186490 Refs: https://github.com/electron/electron/issues/31382 * chore: update support_mixed_sandbox_with_zygote.patch * Enable -Wunused-but-set-variable. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3234737 * fixup! ozone: //ui/base: clean up from USE_X11 1/* * fixup! ozone: //chrome/browser clean up from USE_X11 * chore: fix deprecation warning in libuv * chore: fixup for lint * 3251161: Reland "Make the Clang update.py script require Python 3" https://chromium-review.googlesource.com/c/chromium/src/+/3251161 * fixup: Enable -Wunused-but-set-variable. * [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA https://chromium-review.googlesource.com/c/chromium/src/+/3262369 * Replace sandbox::policy::SandboxType with mojom Sandbox enum https://chromium-review.googlesource.com/c/chromium/src/+/3213677 * fixup: [content] Make ContentMainParams and MainFunctionParams move-only * build: ensure angle has a full git checkout available to it * fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA * fixup lint * [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame https://chromium-review.googlesource.com/c/chromium/src/+/3223434 * fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions * 3217591: Move browser UI CSS color parsing to own file part 2/2 https://chromium-review.googlesource.com/c/chromium/src/+/3217591 * Make kNoSandboxAndElevatedPrivileges only available to utilities https://chromium-review.googlesource.com/c/chromium/src/+/3276784 * 3211575: [modules] Change ScriptOrModule to custom Struct https://chromium-review.googlesource.com/c/v8/v8/+/3211575 * Address review feedback * chore: update patches * 3211575: [modules] Change ScriptOrModule to custom Struct https://chromium-review.googlesource.com/c/v8/v8/+/3211575 * fix: unused variable compat * chore: remove redundant patch * fixup for 3262517: Re-enable WindowCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3262517 * chore: cleanup todo The functions added in https://chromium-review.googlesource.com/c/chromium/src/+/3256802 are not used by offscreen rendering. * fixup: update mas_no_private_api.patch * 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216879 Fixes up commit b2f1aca95604ec61649808c846657454097e6935 * chore: cleanup support_mixed_sandbox_with_zygote.patch * test: use window focus event instead of delay to wait for webContents focus Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
224 lines
7.6 KiB
C++
224 lines
7.6 KiB
C++
// Copyright (c) 2019 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "electron/shell/renderer/electron_api_service_impl.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/environment.h"
|
|
#include "base/ignore_result.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "base/trace_event/trace_event.h"
|
|
#include "gin/data_object_builder.h"
|
|
#include "mojo/public/cpp/system/platform_handle.h"
|
|
#include "shell/common/electron_constants.h"
|
|
#include "shell/common/gin_converters/blink_converter.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/heap_snapshot.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "shell/common/v8_value_serializer.h"
|
|
#include "shell/renderer/electron_render_frame_observer.h"
|
|
#include "shell/renderer/renderer_client_base.h"
|
|
#include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-shared.h"
|
|
#include "third_party/blink/public/web/blink.h"
|
|
#include "third_party/blink/public/web/web_local_frame.h"
|
|
#include "third_party/blink/public/web/web_message_port_converter.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const char kIpcKey[] = "ipcNative";
|
|
|
|
// Gets the private object under kIpcKey
|
|
v8::Local<v8::Object> GetIpcObject(v8::Local<v8::Context> context) {
|
|
auto* isolate = context->GetIsolate();
|
|
auto binding_key = gin::StringToV8(isolate, kIpcKey);
|
|
auto private_binding_key = v8::Private::ForApi(isolate, binding_key);
|
|
auto global_object = context->Global();
|
|
auto value =
|
|
global_object->GetPrivate(context, private_binding_key).ToLocalChecked();
|
|
if (value.IsEmpty() || !value->IsObject()) {
|
|
LOG(ERROR) << "Attempted to get the 'ipcNative' object but it was missing";
|
|
return v8::Local<v8::Object>();
|
|
}
|
|
return value->ToObject(context).ToLocalChecked();
|
|
}
|
|
|
|
void InvokeIpcCallback(v8::Local<v8::Context> context,
|
|
const std::string& callback_name,
|
|
std::vector<v8::Local<v8::Value>> args) {
|
|
TRACE_EVENT0("devtools.timeline", "FunctionCall");
|
|
auto* isolate = context->GetIsolate();
|
|
|
|
auto ipcNative = GetIpcObject(context);
|
|
if (ipcNative.IsEmpty())
|
|
return;
|
|
|
|
// Only set up the node::CallbackScope if there's a node environment.
|
|
// Sandboxed renderers don't have a node environment.
|
|
node::Environment* env = node::Environment::GetCurrent(context);
|
|
std::unique_ptr<node::CallbackScope> callback_scope;
|
|
if (env) {
|
|
node::async_context async_context = {};
|
|
callback_scope = std::make_unique<node::CallbackScope>(isolate, ipcNative,
|
|
async_context);
|
|
}
|
|
|
|
auto callback_key = gin::ConvertToV8(isolate, callback_name)
|
|
->ToString(context)
|
|
.ToLocalChecked();
|
|
auto callback_value = ipcNative->Get(context, callback_key).ToLocalChecked();
|
|
DCHECK(callback_value->IsFunction()); // set by init.ts
|
|
auto callback = callback_value.As<v8::Function>();
|
|
ignore_result(callback->Call(context, ipcNative, args.size(), args.data()));
|
|
}
|
|
|
|
void EmitIPCEvent(v8::Local<v8::Context> context,
|
|
bool internal,
|
|
const std::string& channel,
|
|
std::vector<v8::Local<v8::Value>> ports,
|
|
v8::Local<v8::Value> args,
|
|
int32_t sender_id) {
|
|
auto* isolate = context->GetIsolate();
|
|
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
v8::MicrotasksScope script_scope(isolate,
|
|
v8::MicrotasksScope::kRunMicrotasks);
|
|
|
|
std::vector<v8::Local<v8::Value>> argv = {
|
|
gin::ConvertToV8(isolate, internal), gin::ConvertToV8(isolate, channel),
|
|
gin::ConvertToV8(isolate, ports), args,
|
|
gin::ConvertToV8(isolate, sender_id)};
|
|
|
|
InvokeIpcCallback(context, "onMessage", argv);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronApiServiceImpl::~ElectronApiServiceImpl() = default;
|
|
|
|
ElectronApiServiceImpl::ElectronApiServiceImpl(
|
|
content::RenderFrame* render_frame,
|
|
RendererClientBase* renderer_client)
|
|
: content::RenderFrameObserver(render_frame),
|
|
renderer_client_(renderer_client) {
|
|
registry_.AddInterface(base::BindRepeating(&ElectronApiServiceImpl::BindTo,
|
|
base::Unretained(this)));
|
|
}
|
|
|
|
void ElectronApiServiceImpl::BindTo(
|
|
mojo::PendingReceiver<mojom::ElectronRenderer> receiver) {
|
|
if (document_created_) {
|
|
if (receiver_.is_bound())
|
|
receiver_.reset();
|
|
|
|
receiver_.Bind(std::move(receiver));
|
|
receiver_.set_disconnect_handler(base::BindOnce(
|
|
&ElectronApiServiceImpl::OnConnectionError, GetWeakPtr()));
|
|
} else {
|
|
pending_receiver_ = std::move(receiver);
|
|
}
|
|
}
|
|
|
|
void ElectronApiServiceImpl::OnInterfaceRequestForFrame(
|
|
const std::string& interface_name,
|
|
mojo::ScopedMessagePipeHandle* interface_pipe) {
|
|
registry_.TryBindInterface(interface_name, interface_pipe);
|
|
}
|
|
|
|
void ElectronApiServiceImpl::DidCreateDocumentElement() {
|
|
document_created_ = true;
|
|
|
|
if (pending_receiver_) {
|
|
if (receiver_.is_bound())
|
|
receiver_.reset();
|
|
|
|
receiver_.Bind(std::move(pending_receiver_));
|
|
receiver_.set_disconnect_handler(base::BindOnce(
|
|
&ElectronApiServiceImpl::OnConnectionError, GetWeakPtr()));
|
|
}
|
|
}
|
|
|
|
void ElectronApiServiceImpl::OnDestruct() {
|
|
delete this;
|
|
}
|
|
|
|
void ElectronApiServiceImpl::OnConnectionError() {
|
|
if (receiver_.is_bound())
|
|
receiver_.reset();
|
|
}
|
|
|
|
void ElectronApiServiceImpl::Message(bool internal,
|
|
const std::string& channel,
|
|
blink::CloneableMessage arguments,
|
|
int32_t sender_id) {
|
|
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
if (!frame)
|
|
return;
|
|
|
|
v8::Isolate* isolate = blink::MainThreadIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
v8::Local<v8::Context> context = renderer_client_->GetContext(frame, isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
v8::Local<v8::Value> args = gin::ConvertToV8(isolate, arguments);
|
|
|
|
EmitIPCEvent(context, internal, channel, {}, args, sender_id);
|
|
}
|
|
|
|
void ElectronApiServiceImpl::ReceivePostMessage(
|
|
const std::string& channel,
|
|
blink::TransferableMessage message) {
|
|
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
if (!frame)
|
|
return;
|
|
|
|
v8::Isolate* isolate = blink::MainThreadIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
v8::Local<v8::Context> context = renderer_client_->GetContext(frame, isolate);
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
v8::Local<v8::Value> message_value = DeserializeV8Value(isolate, message);
|
|
|
|
std::vector<v8::Local<v8::Value>> ports;
|
|
for (auto& port : message.ports) {
|
|
ports.emplace_back(
|
|
blink::WebMessagePortConverter::EntangleAndInjectMessagePortChannel(
|
|
context, std::move(port)));
|
|
}
|
|
|
|
std::vector<v8::Local<v8::Value>> args = {message_value};
|
|
|
|
EmitIPCEvent(context, false, channel, ports, gin::ConvertToV8(isolate, args),
|
|
0);
|
|
}
|
|
|
|
void ElectronApiServiceImpl::TakeHeapSnapshot(
|
|
mojo::ScopedHandle file,
|
|
TakeHeapSnapshotCallback callback) {
|
|
base::ThreadRestrictions::ScopedAllowIO allow_io;
|
|
|
|
base::ScopedPlatformFile platform_file;
|
|
if (mojo::UnwrapPlatformFile(std::move(file), &platform_file) !=
|
|
MOJO_RESULT_OK) {
|
|
LOG(ERROR) << "Unable to get the file handle from mojo.";
|
|
std::move(callback).Run(false);
|
|
return;
|
|
}
|
|
base::File base_file(std::move(platform_file));
|
|
|
|
bool success =
|
|
electron::TakeHeapSnapshot(blink::MainThreadIsolate(), &base_file);
|
|
|
|
std::move(callback).Run(success);
|
|
}
|
|
|
|
} // namespace electron
|