mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
172 lines
5.4 KiB
C++
172 lines
5.4 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/net/node_stream_loader.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "mojo/public/cpp/system/string_data_source.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace electron {
|
|
|
|
NodeStreamLoader::NodeStreamLoader(
|
|
network::mojom::URLResponseHeadPtr head,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Object> emitter)
|
|
: url_loader_(this, std::move(loader)),
|
|
client_(std::move(client)),
|
|
isolate_(isolate),
|
|
emitter_(isolate, emitter) {
|
|
url_loader_.set_disconnect_handler(
|
|
base::BindOnce(&NodeStreamLoader::NotifyComplete,
|
|
weak_factory_.GetWeakPtr(), net::ERR_FAILED));
|
|
|
|
Start(std::move(head));
|
|
}
|
|
|
|
NodeStreamLoader::~NodeStreamLoader() {
|
|
v8::Locker locker(isolate_);
|
|
v8::Isolate::Scope isolate_scope(isolate_);
|
|
v8::HandleScope handle_scope(isolate_);
|
|
|
|
// Unsubscribe all handlers.
|
|
for (const auto& it : handlers_) {
|
|
v8::Local<v8::Value> args[] = {gin::StringToV8(isolate_, it.first),
|
|
it.second.Get(isolate_)};
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
|
|
node::arraysize(args), args, {0, 0});
|
|
}
|
|
|
|
// Destroy the stream if not already ended
|
|
if (!ended_) {
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "destroy", 0, nullptr,
|
|
{0, 0});
|
|
}
|
|
}
|
|
|
|
void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
|
MojoResult rv = mojo::CreateDataPipe(nullptr, producer, consumer);
|
|
if (rv != MOJO_RESULT_OK) {
|
|
NotifyComplete(net::ERR_INSUFFICIENT_RESOURCES);
|
|
return;
|
|
}
|
|
|
|
producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
|
|
client_->OnReceiveResponse(std::move(head));
|
|
client_->OnStartLoadingResponseBody(std::move(consumer));
|
|
|
|
auto weak = weak_factory_.GetWeakPtr();
|
|
On("end",
|
|
base::BindRepeating(&NodeStreamLoader::NotifyComplete, weak, net::OK));
|
|
On("error", base::BindRepeating(&NodeStreamLoader::NotifyComplete, weak,
|
|
net::ERR_FAILED));
|
|
On("readable", base::BindRepeating(&NodeStreamLoader::NotifyReadable, weak));
|
|
}
|
|
|
|
void NodeStreamLoader::NotifyReadable() {
|
|
if (!readable_)
|
|
ReadMore();
|
|
else if (is_reading_)
|
|
has_read_waiting_ = true;
|
|
readable_ = true;
|
|
}
|
|
|
|
void NodeStreamLoader::NotifyComplete(int result) {
|
|
// Wait until write finishes or fails.
|
|
if (is_reading_ || is_writing_) {
|
|
ended_ = true;
|
|
result_ = result;
|
|
return;
|
|
}
|
|
|
|
client_->OnComplete(network::URLLoaderCompletionStatus(result));
|
|
delete this;
|
|
}
|
|
|
|
void NodeStreamLoader::ReadMore() {
|
|
if (is_reading_) {
|
|
// Calling read() can trigger the "readable" event again, making this
|
|
// function re-entrant. If we're already reading, we don't want to start
|
|
// a nested read, so short-circuit.
|
|
return;
|
|
}
|
|
is_reading_ = true;
|
|
auto weak = weak_factory_.GetWeakPtr();
|
|
v8::HandleScope scope(isolate_);
|
|
// buffer = emitter.read()
|
|
v8::MaybeLocal<v8::Value> ret = node::MakeCallback(
|
|
isolate_, emitter_.Get(isolate_), "read", 0, nullptr, {0, 0});
|
|
DCHECK(weak) << "We shouldn't have been destroyed when calling read()";
|
|
|
|
// If there is no buffer read, wait until |readable| is emitted again.
|
|
v8::Local<v8::Value> buffer;
|
|
if (!ret.ToLocal(&buffer) || !node::Buffer::HasInstance(buffer)) {
|
|
is_reading_ = false;
|
|
|
|
// If 'readable' was called after 'read()', try again
|
|
if (has_read_waiting_) {
|
|
has_read_waiting_ = false;
|
|
ReadMore();
|
|
return;
|
|
}
|
|
|
|
readable_ = false;
|
|
if (ended_) {
|
|
NotifyComplete(result_);
|
|
}
|
|
return;
|
|
}
|
|
|
|
// Hold the buffer until the write is done.
|
|
buffer_.Reset(isolate_, buffer);
|
|
|
|
// Write buffer to mojo pipe asynchronously.
|
|
is_reading_ = false;
|
|
is_writing_ = true;
|
|
producer_->Write(std::make_unique<mojo::StringDataSource>(
|
|
base::StringPiece(node::Buffer::Data(buffer),
|
|
node::Buffer::Length(buffer)),
|
|
mojo::StringDataSource::AsyncWritingMode::
|
|
STRING_STAYS_VALID_UNTIL_COMPLETION),
|
|
base::BindOnce(&NodeStreamLoader::DidWrite, weak));
|
|
}
|
|
|
|
void NodeStreamLoader::DidWrite(MojoResult result) {
|
|
is_writing_ = false;
|
|
// We were told to end streaming.
|
|
if (ended_) {
|
|
NotifyComplete(result_);
|
|
return;
|
|
}
|
|
|
|
if (result == MOJO_RESULT_OK && readable_)
|
|
ReadMore();
|
|
else
|
|
NotifyComplete(net::ERR_FAILED);
|
|
}
|
|
|
|
void NodeStreamLoader::On(const char* event, EventCallback callback) {
|
|
v8::Locker locker(isolate_);
|
|
v8::Isolate::Scope isolate_scope(isolate_);
|
|
v8::HandleScope handle_scope(isolate_);
|
|
|
|
// emitter.on(event, callback)
|
|
v8::Local<v8::Value> args[] = {
|
|
gin::StringToV8(isolate_, event),
|
|
gin_helper::CallbackToV8Leaked(isolate_, std::move(callback)),
|
|
};
|
|
handlers_[event].Reset(isolate_, args[1]);
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "on",
|
|
node::arraysize(args), args, {0, 0});
|
|
// No more code bellow, as this class may destruct when subscribing.
|
|
}
|
|
|
|
} // namespace electron
|