d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
301 lines
8.5 KiB
C++
301 lines
8.5 KiB
C++
// Copyright (c) 2015 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_download_item.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "net/base/filename_util.h"
|
|
#include "shell/browser/electron_browser_main_parts.h"
|
|
#include "shell/common/gin_converters/file_dialog_converter.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<download::DownloadItem::DownloadState> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
download::DownloadItem::DownloadState state) {
|
|
std::string download_state;
|
|
switch (state) {
|
|
case download::DownloadItem::IN_PROGRESS:
|
|
download_state = "progressing";
|
|
break;
|
|
case download::DownloadItem::COMPLETE:
|
|
download_state = "completed";
|
|
break;
|
|
case download::DownloadItem::CANCELLED:
|
|
download_state = "cancelled";
|
|
break;
|
|
case download::DownloadItem::INTERRUPTED:
|
|
download_state = "interrupted";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return ConvertToV8(isolate, download_state);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron::api {
|
|
|
|
namespace {
|
|
|
|
// Ordinarily base::SupportsUserData only supports strong links, where the
|
|
// thing to which the user data is attached owns the user data. But we can't
|
|
// make the api::DownloadItem owned by the DownloadItem, since it's owned by
|
|
// V8. So this makes a weak link. The lifetimes of download::DownloadItem and
|
|
// api::DownloadItem are fully independent, and either one may be destroyed
|
|
// before the other.
|
|
struct UserDataLink : base::SupportsUserData::Data {
|
|
explicit UserDataLink(base::WeakPtr<DownloadItem> item)
|
|
: download_item(item) {}
|
|
|
|
base::WeakPtr<DownloadItem> download_item;
|
|
};
|
|
|
|
const void* kElectronApiDownloadItemKey = &kElectronApiDownloadItemKey;
|
|
|
|
} // namespace
|
|
|
|
gin::WrapperInfo DownloadItem::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
// static
|
|
DownloadItem* DownloadItem::FromDownloadItem(download::DownloadItem* item) {
|
|
// ^- say that 7 times fast in a row
|
|
auto* data = static_cast<UserDataLink*>(
|
|
item->GetUserData(kElectronApiDownloadItemKey));
|
|
return data ? data->download_item.get() : nullptr;
|
|
}
|
|
|
|
DownloadItem::DownloadItem(v8::Isolate* isolate, download::DownloadItem* item)
|
|
: download_item_(item), isolate_(isolate) {
|
|
download_item_->AddObserver(this);
|
|
download_item_->SetUserData(
|
|
kElectronApiDownloadItemKey,
|
|
std::make_unique<UserDataLink>(weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
DownloadItem::~DownloadItem() {
|
|
if (download_item_) {
|
|
// Destroyed by either garbage collection or destroy().
|
|
download_item_->RemoveObserver(this);
|
|
download_item_->Remove();
|
|
}
|
|
}
|
|
|
|
bool DownloadItem::CheckAlive() const {
|
|
if (!download_item_) {
|
|
gin_helper::ErrorThrower(isolate_).ThrowError(
|
|
"DownloadItem used after being destroyed");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void DownloadItem::OnDownloadUpdated(download::DownloadItem* item) {
|
|
if (!CheckAlive())
|
|
return;
|
|
if (download_item_->IsDone()) {
|
|
Emit("done", item->GetState());
|
|
Unpin();
|
|
} else {
|
|
Emit("updated", item->GetState());
|
|
}
|
|
}
|
|
|
|
void DownloadItem::OnDownloadDestroyed(download::DownloadItem* /*item*/) {
|
|
download_item_ = nullptr;
|
|
Unpin();
|
|
}
|
|
|
|
void DownloadItem::Pause() {
|
|
if (!CheckAlive())
|
|
return;
|
|
download_item_->Pause();
|
|
}
|
|
|
|
bool DownloadItem::IsPaused() const {
|
|
if (!CheckAlive())
|
|
return false;
|
|
return download_item_->IsPaused();
|
|
}
|
|
|
|
void DownloadItem::Resume() {
|
|
if (!CheckAlive())
|
|
return;
|
|
download_item_->Resume(true /* user_gesture */);
|
|
}
|
|
|
|
bool DownloadItem::CanResume() const {
|
|
if (!CheckAlive())
|
|
return false;
|
|
return download_item_->CanResume();
|
|
}
|
|
|
|
void DownloadItem::Cancel() {
|
|
if (!CheckAlive())
|
|
return;
|
|
download_item_->Cancel(true);
|
|
}
|
|
|
|
int64_t DownloadItem::GetReceivedBytes() const {
|
|
if (!CheckAlive())
|
|
return 0;
|
|
return download_item_->GetReceivedBytes();
|
|
}
|
|
|
|
int64_t DownloadItem::GetTotalBytes() const {
|
|
if (!CheckAlive())
|
|
return 0;
|
|
return download_item_->GetTotalBytes();
|
|
}
|
|
|
|
std::string DownloadItem::GetMimeType() const {
|
|
if (!CheckAlive())
|
|
return "";
|
|
return download_item_->GetMimeType();
|
|
}
|
|
|
|
bool DownloadItem::HasUserGesture() const {
|
|
if (!CheckAlive())
|
|
return false;
|
|
return download_item_->HasUserGesture();
|
|
}
|
|
|
|
std::string DownloadItem::GetFilename() const {
|
|
if (!CheckAlive())
|
|
return "";
|
|
return base::UTF16ToUTF8(
|
|
net::GenerateFileName(GetURL(), GetContentDisposition(), std::string(),
|
|
download_item_->GetSuggestedFilename(),
|
|
GetMimeType(), "download")
|
|
.LossyDisplayName());
|
|
}
|
|
|
|
std::string DownloadItem::GetContentDisposition() const {
|
|
if (!CheckAlive())
|
|
return "";
|
|
return download_item_->GetContentDisposition();
|
|
}
|
|
|
|
const GURL& DownloadItem::GetURL() const {
|
|
if (!CheckAlive())
|
|
return GURL::EmptyGURL();
|
|
return download_item_->GetURL();
|
|
}
|
|
|
|
v8::Local<v8::Value> DownloadItem::GetURLChain() const {
|
|
if (!CheckAlive())
|
|
return v8::Local<v8::Value>();
|
|
return gin::ConvertToV8(isolate_, download_item_->GetUrlChain());
|
|
}
|
|
|
|
download::DownloadItem::DownloadState DownloadItem::GetState() const {
|
|
if (!CheckAlive())
|
|
return download::DownloadItem::IN_PROGRESS;
|
|
return download_item_->GetState();
|
|
}
|
|
|
|
bool DownloadItem::IsDone() const {
|
|
if (!CheckAlive())
|
|
return false;
|
|
return download_item_->IsDone();
|
|
}
|
|
|
|
void DownloadItem::SetSavePath(const base::FilePath& path) {
|
|
save_path_ = path;
|
|
}
|
|
|
|
base::FilePath DownloadItem::GetSavePath() const {
|
|
return save_path_;
|
|
}
|
|
|
|
file_dialog::DialogSettings DownloadItem::GetSaveDialogOptions() const {
|
|
return dialog_options_;
|
|
}
|
|
|
|
void DownloadItem::SetSaveDialogOptions(
|
|
const file_dialog::DialogSettings& options) {
|
|
dialog_options_ = options;
|
|
}
|
|
|
|
std::string DownloadItem::GetLastModifiedTime() const {
|
|
if (!CheckAlive())
|
|
return "";
|
|
return download_item_->GetLastModifiedTime();
|
|
}
|
|
|
|
std::string DownloadItem::GetETag() const {
|
|
if (!CheckAlive())
|
|
return "";
|
|
return download_item_->GetETag();
|
|
}
|
|
|
|
double DownloadItem::GetStartTime() const {
|
|
if (!CheckAlive())
|
|
return 0;
|
|
return download_item_->GetStartTime().ToDoubleT();
|
|
}
|
|
|
|
// static
|
|
gin::ObjectTemplateBuilder DownloadItem::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<DownloadItem>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("pause", &DownloadItem::Pause)
|
|
.SetMethod("isPaused", &DownloadItem::IsPaused)
|
|
.SetMethod("resume", &DownloadItem::Resume)
|
|
.SetMethod("canResume", &DownloadItem::CanResume)
|
|
.SetMethod("cancel", &DownloadItem::Cancel)
|
|
.SetMethod("getReceivedBytes", &DownloadItem::GetReceivedBytes)
|
|
.SetMethod("getTotalBytes", &DownloadItem::GetTotalBytes)
|
|
.SetMethod("getMimeType", &DownloadItem::GetMimeType)
|
|
.SetMethod("hasUserGesture", &DownloadItem::HasUserGesture)
|
|
.SetMethod("getFilename", &DownloadItem::GetFilename)
|
|
.SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
|
|
.SetMethod("getURL", &DownloadItem::GetURL)
|
|
.SetMethod("getURLChain", &DownloadItem::GetURLChain)
|
|
.SetMethod("getState", &DownloadItem::GetState)
|
|
.SetMethod("isDone", &DownloadItem::IsDone)
|
|
.SetMethod("setSavePath", &DownloadItem::SetSavePath)
|
|
.SetMethod("getSavePath", &DownloadItem::GetSavePath)
|
|
.SetProperty("savePath", &DownloadItem::GetSavePath,
|
|
&DownloadItem::SetSavePath)
|
|
.SetMethod("setSaveDialogOptions", &DownloadItem::SetSaveDialogOptions)
|
|
.SetMethod("getSaveDialogOptions", &DownloadItem::GetSaveDialogOptions)
|
|
.SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
|
|
.SetMethod("getETag", &DownloadItem::GetETag)
|
|
.SetMethod("getStartTime", &DownloadItem::GetStartTime);
|
|
}
|
|
|
|
const char* DownloadItem::GetTypeName() {
|
|
return "DownloadItem";
|
|
}
|
|
|
|
// static
|
|
gin::Handle<DownloadItem> DownloadItem::FromOrCreate(
|
|
v8::Isolate* isolate,
|
|
download::DownloadItem* item) {
|
|
DownloadItem* existing = FromDownloadItem(item);
|
|
if (existing)
|
|
return gin::CreateHandle(isolate, existing);
|
|
|
|
auto handle = gin::CreateHandle(isolate, new DownloadItem(isolate, item));
|
|
|
|
handle->Pin(isolate);
|
|
|
|
return handle;
|
|
}
|
|
|
|
} // namespace electron::api
|