fb9d3ec897
* chore: bump chromium to 126.0.6445.0 31-x-y * chore: bump chromium in DEPS to 125.0.6421.0 * chore: bump chromium in DEPS to 125.0.6422.0 * Add ENABLE_BASE_TRACING flags for compatibility with enable_base_tracing = false on Windows https://chromium-review.googlesource.com/c/chromium/src/+/5434658 * chore: update patches * fixup: Add ENABLE_BASE_TRACING flags for compatibility with enable_base_tracing = false on Windows * chore: bump chromium in DEPS to 126.0.6423.0 * chore: update patches * 5426599: Next generation control of unsafe-buffers-usage plugin https://chromium-review.googlesource.com/c/chromium/src/+/5426599 * chore: bump chromium in DEPS to 126.0.6425.0 * chore: update patches * Roll clang+rust llvmorg-19-init-7229-g315c88c5-2 : llvmorg-19-init-8091-gab037c4f-1 / ceab6128fa48a616bfd3e3adf4bc80133b8ee223-1 : ab71ee7a9214c2793108a41efb065aa77aeb7326-1 https://chromium-review.googlesource.com/c/chromium/src/+/5444328 Also see https://issues.chromium.org/issues/332931387 * 5445074: [Views AX] Move AXEventNotificationDetails to ui/accessibility/ https://chromium-review.googlesource.com/c/chromium/src/+/5445074 Also 5455993: [Views AX] Rename AXEventNotificationDetails to AXUpdatesAndEvents | https://chromium-review.googlesource.com/c/chromium/src/+/5455993 * Pass IsolationInfo to ContentBrowserClient::WillCreateURLLoaderFactory() https://chromium-review.googlesource.com/c/chromium/src/+/5405301 * chore: bump chromium in DEPS to 126.0.6427.0 * chore: update patches * chore: remove no longer needed patch perfetto is now turned on so this patch is no longer needed. * chore: bump chromium in DEPS to 126.0.6429.0 * chore: bump chromium in DEPS to 126.0.6431.0 * chore: bump chromium in DEPS to 126.0.6433.0 * 5466654: Do not create a console if logging to a handle https://chromium-review.googlesource.com/c/chromium/src/+/5466654 * chore: fixup patch indices * Address Linux NonClientFrameView Changes - https://chromium-review.googlesource.com/c/chromium/src/+/5180720 - https://chromium-review.googlesource.com/c/chromium/src/+/5367794 * chore: bump chromium in DEPS to 126.0.6435.0 * chore: bump chromium in DEPS to 126.0.6437.0 * chore: update patches * chore: bump chromium in DEPS to 126.0.6439.0 * chore: bump chromium in DEPS to 126.0.6441.0 * 5477689: components/crash/content/tools: Format with yapf | https://chromium-review.googlesource.com/c/chromium/src/+/5477689 * 5485006: Remove enable_print_content_analysis GN flag | https://chromium-review.googlesource.com/c/chromium/src/+/5485006 * chore: update chromium patches * chore: bump chromium in DEPS to 126.0.6443.0 * 5465608: Convert DCHECKs near RenderWidgetHost, DelegatedFrameHost to CHECK | https://chromium-review.googlesource.com/c/chromium/src/+/5465608 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs | https://chromium-review.googlesource.com/c/chromium/src/+/5492605 * chore: update patches * chore: bump chromium in DEPS to 126.0.6445.0 * chore: update patches * 5468588: Fullscreen: Encapsulate ExclusiveAccessBubble params in a struct | https://chromium-review.googlesource.com/c/chromium/src/+/5468588 * fixup! 5485006: Remove enable_print_content_analysis GN flag | https://chromium-review.googlesource.com/c/chromium/src/+/5485006 * 5461340: `size_t` in `mojo::DataPipe[Consumer|Producer]Handle`: /components. | https://chromium-review.googlesource.com/c/chromium/src/+/5461340 * 5480213: Add an EvictIds struct to FrameEvictorClient | https://chromium-review.googlesource.com/c/chromium/src/+/5480213 * 4341506: [api] Deprecate Isolate::IdleNotificationDeadline | https://chromium-review.googlesource.com/c/v8/v8/+/4341506 * 5300826: [v8-tasks] Add source location to v8::TaskRunner, step 4/4. | https://chromium-review.googlesource.com/c/v8/v8/+/5300826 * partially revert is_newly_created to allow for browser initiated about:blank loads * add dep on app_launch_prefetch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5420149 * install sysroots from electron not from chrome We should add a new var upstream for `download_sysroots` so that we can skip downloading chromes at all. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5462469 * refactor: make UpdateFrameHints an override Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5473548 * fix ppapi * refactor: update namespace for pwm switches Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5444617 * 5459367: WebSQL: Restrict WebSQL service creation to Android only | https://chromium-review.googlesource.com/c/chromium/src/+/5459367 * 5455853: Revert "[Clipboard] Don't add meta charset tag for async write() method on Mac." | https://chromium-review.googlesource.com/c/chromium/src/+/5455853 * fixup! refactor: update namespace for pwm switches edd9e26 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5444617 * 5147611: [heap] Add checks for ensuring position info slow path is not used in heap snapshot | https://chromium-review.googlesource.com/c/v8/v8/+/5147611 * fixup! 5412666: [heap] Also avoid heap allocation for allocation tracked functions | https://chromium-review.googlesource.com/c/v8/v8/+/5412666 * chore: add websql removal to breaking-changes.md --------- 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: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update .patches after trop * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> 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: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
191 lines
5.8 KiB
C++
191 lines
5.8 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.
|
|
size_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;
|
|
}
|
|
|
|
const char* DataPipeHolder::GetTypeName() {
|
|
return "DataPipeHolder";
|
|
}
|
|
|
|
// 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
|