mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 120.0.6099.0 (main) (#40316)

Browse source 
* chore: bump chromium in DEPS to 120.0.6086.0

* chore: update patches

* chore: rename FrameSubscriber::OnNewCropVersion()

Xref: 4905819

just a simple renaming

* chore: rename ToJsTime() to .InMillisecondsFSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: rename ToDoubleT() to .InSecondsFSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: rename FromDoubleT() to .FromSecondsSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: bump chromium in DEPS to 120.0.6088.2

* chore: update patches

* chore: regen filenames.libcxx.gni

* chore: migrate from (removed upstream) inputFormType to formControlType

* chore: bump chromium in DEPS to 120.0.6089.0

* chore: update allow_disabling_blink_scheduler_throttling_per_renderview.patch

Xref: 4828507

manually sync to upstream changes + reduce diff size

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6090.0

* chore: update fix_disabling_background_throttling_in_compositor.patch

no manual changes; patch applied with fuzz 2 (4 lines)

Xref: 4944206

* chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch

Xref: 4946653

do not patch WebContentsImpl::SetWindowShowState() any longer because it has been removed

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6091.0

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6093.0

* chore: bump chromium in DEPS to 120.0.6095.0

* chore: bump chromium in DEPS to 120.0.6096.0

* chore: bump chromium in DEPS to 120.0.6097.0

* chore: update patches

* chore: update patch after rebase

* 4961495: [document pip] Focus the window when opened manually

4961495

* [Extensions UserScripts] Store extensions with user scripts in tracker

 | 4950530

* chore: bump chromium in DEPS to 120.0.6099.0

* chore: update patches

* chore: update filenames.libcxx.gni

* chore: remove trailing space

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-11-01 10:02:12 -04:00 • committed by GitHub
parent 83892ab995
commit bc1ba1fe9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 611 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_app.cc
View file

@ -1370,8 +1370,8 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
pid_dict.Set("pid", process_metric.second->process.Pid());
pid_dict.Set("type", content::GetProcessTypeNameInEnglish(
process_metric.second->type));
pid_dict.Set("creationTime",
process_metric.second->process.CreationTime().ToJsTime());
pid_dict.Set("creationTime", process_metric.second->process.CreationTime()
.InMillisecondsFSinceUnixEpoch());
if (!process_metric.second->service_name.empty()) {
pid_dict.Set("serviceName", process_metric.second->service_name);

6
shell/browser/api/electron_api_cookies.cc
View file

@ -61,7 +61,7 @@ struct Converter<net::CanonicalCookie> {
dict.Set("httpOnly", val.IsHttpOnly());
dict.Set("session", !val.IsPersistent());
if (val.IsPersistent())
dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
dict.Set("expirationDate", val.ExpiryDate().InSecondsFSinceUnixEpoch());
dict.Set("sameSite", val.SameSite());
return ConvertToV8(isolate, dict).As<v8::Object>();
}
@ -164,9 +164,9 @@ void FilterCookieWithStatuses(
base::Time ParseTimeProperty(const absl::optional<double>& value) {
if (!value) // empty time means ignoring the parameter
return base::Time();
if (*value == 0) // FromDoubleT would convert 0 to empty Time
if (*value == 0) // FromSecondsSinceUnixEpoch would convert 0 to empty Time
return base::Time::UnixEpoch();
return base::Time::FromDoubleT(*value);
return base::Time::FromSecondsSinceUnixEpoch(*value);
}
base::StringPiece InclusionStatusToString(net::CookieInclusionStatus status) {

2
shell/browser/api/electron_api_download_item.cc
View file

@ -245,7 +245,7 @@ std::string DownloadItem::GetETag() const {
double DownloadItem::GetStartTime() const {
if (!CheckAlive())
return 0;
return download_item_->GetStartTime().ToDoubleT();
return download_item_->GetStartTime().InSecondsFSinceUnixEpoch();
}
// static

5
shell/browser/api/electron_api_session.cc
View file

@ -828,7 +828,7 @@ void Session::DownloadURL(const GURL& url, gin::Arguments* args) {
void Session::CreateInterruptedDownload(const gin_helper::Dictionary& options) {
int64_t offset = 0, length = 0;
double start_time = base::Time::Now().ToDoubleT();
double start_time = base::Time::Now().InSecondsFSinceUnixEpoch();
std::string mime_type, last_modified, etag;
base::FilePath path;
std::vector<GURL> url_chain;
@ -853,7 +853,8 @@ void Session::CreateInterruptedDownload(const gin_helper::Dictionary& options) {
auto* download_manager = browser_context()->GetDownloadManager();
download_manager->GetNextId(base::BindRepeating(
&DownloadIdCallback, download_manager, path, url_chain, mime_type, offset,
length, last_modified, etag, base::Time::FromDoubleT(start_time)));
length, last_modified, etag,
base::Time::FromSecondsSinceUnixEpoch(start_time)));
}
void Session::SetPreloads(const std::vector<base::FilePath>& preloads) {

3
shell/browser/api/electron_api_web_request.cc
View file

@ -128,7 +128,8 @@ void ToDictionary(gin_helper::Dictionary* details,
details->Set("id", info->id);
details->Set("url", info->url);
details->Set("method", info->method);
details->Set("timestamp", base::Time::Now().ToDoubleT() * 1000);
details->Set("timestamp",
base::Time::Now().InSecondsFSinceUnixEpoch() * 1000);
details->Set("resourceType", info->web_request_type);
if (!info->response_ip.empty())
details->Set("ip", info->response_ip);

2
shell/browser/api/frame_subscriber.cc
View file

@ -141,7 +141,7 @@ void FrameSubscriber::OnFrameCaptured(
Done(content_rect, bitmap);
}
void FrameSubscriber::OnNewCropVersion(uint32_t crop_version) {}
void FrameSubscriber::OnNewSubCaptureTargetVersion(uint32_t crop_version) {}
void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}

2
shell/browser/api/frame_subscriber.h
View file

@ -57,7 +57,7 @@ class FrameSubscriber : public content::WebContentsObserver,
const gfx::Rect& content_rect,
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
callbacks) override;
void OnNewCropVersion(uint32_t crop_version) override;
void OnNewSubCaptureTargetVersion(uint32_t crop_version) override;
void OnFrameWithEmptyRegionCapture() override;
void OnStopped() override;
void OnLog(const std::string& message) override;