be44a2c5b7
* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip" https://chromium-review.googlesource.com/c/chromium/src/+/4910494 * 4812338: Move partition_alloc into a "partition_alloc" dir. https://chromium-review.googlesource.com/c/chromium/src/+/4812338 * [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog https://chromium-review.googlesource.com/c/chromium/src/+/4909897 * 4894923: Force enable raw_ptrs pointer arithmetic check. https://chromium-review.googlesource.com/c/chromium/src/+/4894923 * gin: Prevent wrappables from being constructed from author code. https://chromium-review.googlesource.com/c/chromium/src/+/4905829 * chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo" https://chromium-review.googlesource.com/c/chromium/src/+/4918545 * 4881761: UI bindings for visual logging with structured metrics. https://chromium-review.googlesource.com/c/chromium/src/+/4881761 * chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components https://chromium-review.googlesource.com/c/chromium/src/+/4911894 * chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4931270 * chore: add TransferDragSecurityInfo() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4928028 * mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4919478 Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944243 * chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4939602 * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4908053 no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4936315 minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4937937 adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4865412 minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4942936 minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4455776 This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4912601 needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
187 lines
5.7 KiB
C++
187 lines
5.7 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_data_pipe_holder.h"
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "mojo/public/cpp/system/data_pipe.h"
|
|
#include "mojo/public/cpp/system/simple_watcher.h"
|
|
#include "net/base/net_errors.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "shell/common/key_weak_map.h"
|
|
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace electron::api {
|
|
|
|
namespace {
|
|
|
|
// Incremental ID.
|
|
int g_next_id = 0;
|
|
|
|
// Map that manages all the DataPipeHolder objects.
|
|
KeyWeakMap<std::string>& AllDataPipeHolders() {
|
|
static base::NoDestructor<KeyWeakMap<std::string>> weak_map;
|
|
return *weak_map.get();
|
|
}
|
|
|
|
// Utility class to read from data pipe.
|
|
class DataPipeReader {
|
|
public:
|
|
DataPipeReader(gin_helper::Promise<v8::Local<v8::Value>> promise,
|
|
mojo::Remote<network::mojom::DataPipeGetter> data_pipe_getter)
|
|
: promise_(std::move(promise)),
|
|
data_pipe_getter_(std::move(data_pipe_getter)),
|
|
handle_watcher_(FROM_HERE,
|
|
mojo::SimpleWatcher::ArmingPolicy::MANUAL,
|
|
base::SequencedTaskRunner::GetCurrentDefault()) {
|
|
// Get a new data pipe and start.
|
|
mojo::ScopedDataPipeProducerHandle producer_handle;
|
|
CHECK_EQ(mojo::CreateDataPipe(nullptr, producer_handle, data_pipe_),
|
|
MOJO_RESULT_OK);
|
|
data_pipe_getter_->Read(std::move(producer_handle),
|
|
base::BindOnce(&DataPipeReader::ReadCallback,
|
|
weak_factory_.GetWeakPtr()));
|
|
handle_watcher_.Watch(data_pipe_.get(), MOJO_HANDLE_SIGNAL_READABLE,
|
|
base::BindRepeating(&DataPipeReader::OnHandleReadable,
|
|
weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
~DataPipeReader() = default;
|
|
|
|
// disable copy
|
|
DataPipeReader(const DataPipeReader&) = delete;
|
|
DataPipeReader& operator=(const DataPipeReader&) = delete;
|
|
|
|
private:
|
|
// Callback invoked by DataPipeGetter::Read.
|
|
void ReadCallback(int32_t status, uint64_t size) {
|
|
if (status != net::OK) {
|
|
OnFailure();
|
|
return;
|
|
}
|
|
buffer_.resize(size);
|
|
head_ = &buffer_.front();
|
|
remaining_size_ = size;
|
|
handle_watcher_.ArmOrNotify();
|
|
}
|
|
|
|
// Called by |handle_watcher_| when data is available or the pipe was closed,
|
|
// and there's a pending Read() call.
|
|
void OnHandleReadable(MojoResult result) {
|
|
if (result != MOJO_RESULT_OK) {
|
|
OnFailure();
|
|
return;
|
|
}
|
|
|
|
// Read.
|
|
uint32_t length = remaining_size_;
|
|
result = data_pipe_->ReadData(head_, &length, MOJO_READ_DATA_FLAG_NONE);
|
|
if (result == MOJO_RESULT_OK) { // success
|
|
remaining_size_ -= length;
|
|
head_ += length;
|
|
if (remaining_size_ == 0) {
|
|
OnSuccess();
|
|
} else {
|
|
handle_watcher_.ArmOrNotify();
|
|
}
|
|
} else if (result == MOJO_RESULT_SHOULD_WAIT) { // IO pending
|
|
handle_watcher_.ArmOrNotify();
|
|
} else { // error
|
|
OnFailure();
|
|
}
|
|
}
|
|
|
|
void OnFailure() {
|
|
promise_.RejectWithErrorMessage("Could not get blob data");
|
|
delete this;
|
|
}
|
|
|
|
void OnSuccess() {
|
|
// Copy the buffer to JS.
|
|
// TODO(nornagon): make this zero-copy by allocating the array buffer
|
|
// inside the sandbox
|
|
v8::HandleScope handle_scope(promise_.isolate());
|
|
v8::Local<v8::Value> buffer =
|
|
node::Buffer::Copy(promise_.isolate(), &buffer_.front(), buffer_.size())
|
|
.ToLocalChecked();
|
|
promise_.Resolve(buffer);
|
|
|
|
// Destroy data pipe.
|
|
handle_watcher_.Cancel();
|
|
delete this;
|
|
}
|
|
|
|
gin_helper::Promise<v8::Local<v8::Value>> promise_;
|
|
|
|
mojo::Remote<network::mojom::DataPipeGetter> data_pipe_getter_;
|
|
mojo::ScopedDataPipeConsumerHandle data_pipe_;
|
|
mojo::SimpleWatcher handle_watcher_;
|
|
|
|
// Stores read data.
|
|
std::vector<char> buffer_;
|
|
|
|
// The head of buffer.
|
|
raw_ptr<char, AllowPtrArithmetic> head_ = nullptr;
|
|
|
|
// Remaining data to read.
|
|
uint64_t remaining_size_ = 0;
|
|
|
|
base::WeakPtrFactory<DataPipeReader> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace
|
|
|
|
gin::WrapperInfo DataPipeHolder::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
DataPipeHolder::DataPipeHolder(const network::DataElement& element)
|
|
: id_(base::NumberToString(++g_next_id)) {
|
|
data_pipe_.Bind(
|
|
element.As<network::DataElementDataPipe>().CloneDataPipeGetter());
|
|
}
|
|
|
|
DataPipeHolder::~DataPipeHolder() = default;
|
|
|
|
v8::Local<v8::Promise> DataPipeHolder::ReadAll(v8::Isolate* isolate) {
|
|
gin_helper::Promise<v8::Local<v8::Value>> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
if (!data_pipe_) {
|
|
promise.RejectWithErrorMessage("Could not get blob data");
|
|
return handle;
|
|
}
|
|
|
|
new DataPipeReader(std::move(promise), std::move(data_pipe_));
|
|
return handle;
|
|
}
|
|
|
|
// static
|
|
gin::Handle<DataPipeHolder> DataPipeHolder::Create(
|
|
v8::Isolate* isolate,
|
|
const network::DataElement& element) {
|
|
auto handle = gin::CreateHandle(isolate, new DataPipeHolder(element));
|
|
AllDataPipeHolders().Set(isolate, handle->id(),
|
|
handle->GetWrapper(isolate).ToLocalChecked());
|
|
return handle;
|
|
}
|
|
|
|
// static
|
|
gin::Handle<DataPipeHolder> DataPipeHolder::From(v8::Isolate* isolate,
|
|
const std::string& id) {
|
|
v8::MaybeLocal<v8::Object> object = AllDataPipeHolders().Get(isolate, id);
|
|
if (!object.IsEmpty()) {
|
|
gin::Handle<DataPipeHolder> handle;
|
|
if (gin::ConvertFromV8(isolate, object.ToLocalChecked(), &handle))
|
|
return handle;
|
|
}
|
|
return gin::Handle<DataPipeHolder>();
|
|
}
|
|
|
|
} // namespace electron::api
|