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

chore: remove obsolete "simple" object annotations for the remote module (#39486)

Browse source
This commit is contained in:
Milan Burda 2023-08-22 06:43:30 +02:00 • committed by GitHub
commit c1898c39bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1347,8 +1347,6 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
auto pid_dict = gin_helper::Dictionary::CreateEmpty(isolate); auto pid_dict = gin_helper::Dictionary::CreateEmpty(isolate);
auto cpu_dict = gin_helper::Dictionary::CreateEmpty(isolate); auto cpu_dict = gin_helper::Dictionary::CreateEmpty(isolate);
pid_dict.SetHidden("simple", true);
cpu_dict.SetHidden("simple", true);
cpu_dict.Set( cpu_dict.Set(
"percentCPUUsage", "percentCPUUsage",
process_metric.second->metrics->GetPlatformIndependentCPUUsage() / process_metric.second->metrics->GetPlatformIndependentCPUUsage() /
@ -1383,7 +1381,6 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
auto memory_info = process_metric.second->GetMemoryInfo(); auto memory_info = process_metric.second->GetMemoryInfo();
auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate); auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate);
memory_dict.SetHidden("simple", true);
memory_dict.Set("workingSetSize", memory_dict.Set("workingSetSize",
static_cast<double>(memory_info.working_set_size >> 10)); static_cast<double>(memory_info.working_set_size >> 10));
memory_dict.Set( memory_dict.Set(

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

@ -21,7 +21,6 @@ struct Converter<in_app_purchase::PaymentDiscount> {
v8::Isolate* isolate, v8::Isolate* isolate,
const in_app_purchase::PaymentDiscount& paymentDiscount) { const in_app_purchase::PaymentDiscount& paymentDiscount) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("identifier", paymentDiscount.identifier); dict.Set("identifier", paymentDiscount.identifier);
dict.Set("keyIdentifier", paymentDiscount.keyIdentifier); dict.Set("keyIdentifier", paymentDiscount.keyIdentifier);
dict.Set("nonce", paymentDiscount.nonce); dict.Set("nonce", paymentDiscount.nonce);
@ -36,7 +35,6 @@ struct Converter<in_app_purchase::Payment> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const in_app_purchase::Payment& payment) { const in_app_purchase::Payment& payment) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("productIdentifier", payment.productIdentifier); dict.Set("productIdentifier", payment.productIdentifier);
dict.Set("quantity", payment.quantity); dict.Set("quantity", payment.quantity);
dict.Set("applicationUsername", payment.applicationUsername); dict.Set("applicationUsername", payment.applicationUsername);
@ -52,7 +50,6 @@ struct Converter<in_app_purchase::Transaction> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const in_app_purchase::Transaction& val) { const in_app_purchase::Transaction& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("transactionIdentifier", val.transactionIdentifier); dict.Set("transactionIdentifier", val.transactionIdentifier);
dict.Set("transactionDate", val.transactionDate); dict.Set("transactionDate", val.transactionDate);
dict.Set("originalTransactionIdentifier", dict.Set("originalTransactionIdentifier",
@ -72,7 +69,6 @@ struct Converter<in_app_purchase::ProductSubscriptionPeriod> {
const in_app_purchase::ProductSubscriptionPeriod& const in_app_purchase::ProductSubscriptionPeriod&
productSubscriptionPeriod) { productSubscriptionPeriod) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("numberOfUnits", productSubscriptionPeriod.numberOfUnits); dict.Set("numberOfUnits", productSubscriptionPeriod.numberOfUnits);
dict.Set("unit", productSubscriptionPeriod.unit); dict.Set("unit", productSubscriptionPeriod.unit);
return dict.GetHandle(); return dict.GetHandle();
@ -85,7 +81,6 @@ struct Converter<in_app_purchase::ProductDiscount> {
v8::Isolate* isolate, v8::Isolate* isolate,
const in_app_purchase::ProductDiscount& productDiscount) { const in_app_purchase::ProductDiscount& productDiscount) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("identifier", productDiscount.identifier); dict.Set("identifier", productDiscount.identifier);
dict.Set("type", productDiscount.type); dict.Set("type", productDiscount.type);
dict.Set("price", productDiscount.price); dict.Set("price", productDiscount.price);
@ -105,7 +100,6 @@ struct Converter<in_app_purchase::Product> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const in_app_purchase::Product& val) { const in_app_purchase::Product& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("productIdentifier", val.productIdentifier); dict.Set("productIdentifier", val.productIdentifier);
dict.Set("localizedDescription", val.localizedDescription); dict.Set("localizedDescription", val.localizedDescription);
dict.Set("localizedTitle", val.localizedTitle); dict.Set("localizedTitle", val.localizedTitle);

1
shell/browser/api/electron_api_system_preferences.cc
View file

@ -36,7 +36,6 @@ SystemPreferences::~SystemPreferences() = default;
v8::Local<v8::Value> SystemPreferences::GetAnimationSettings( v8::Local<v8::Value> SystemPreferences::GetAnimationSettings(
v8::Isolate* isolate) { v8::Isolate* isolate) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("shouldRenderRichAnimation", dict.Set("shouldRenderRichAnimation",
gfx::Animation::ShouldRenderRichAnimation()); gfx::Animation::ShouldRenderRichAnimation());
dict.Set("scrollAnimationsEnabledBySystem", dict.Set("scrollAnimationsEnabledBySystem",

5
shell/common/api/electron_bindings.cc
View file

@ -140,7 +140,6 @@ v8::Local<v8::Value> ElectronBindings::GetHeapStatistics(v8::Isolate* isolate) {
isolate->GetHeapStatistics(&v8_heap_stats); isolate->GetHeapStatistics(&v8_heap_stats);
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("totalHeapSize", dict.Set("totalHeapSize",
static_cast<double>(v8_heap_stats.total_heap_size() >> 10)); static_cast<double>(v8_heap_stats.total_heap_size() >> 10));
dict.Set( dict.Set(
@ -185,7 +184,6 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
} }
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("total", mem_info.total); dict.Set("total", mem_info.total);
// See Chromium's "base/process/process_metrics.h" for an explanation. // See Chromium's "base/process/process_metrics.h" for an explanation.
@ -236,7 +234,6 @@ v8::Local<v8::Value> ElectronBindings::GetBlinkMemoryInfo(
auto total = blink::ProcessHeap::TotalAllocatedSpace(); auto total = blink::ProcessHeap::TotalAllocatedSpace();
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("allocated", static_cast<double>(allocated >> 10)); dict.Set("allocated", static_cast<double>(allocated >> 10));
dict.Set("total", static_cast<double>(total >> 10)); dict.Set("total", static_cast<double>(total >> 10));
return dict.GetHandle(); return dict.GetHandle();
@ -289,7 +286,6 @@ v8::Local<v8::Value> ElectronBindings::GetCPUUsage(
base::ProcessMetrics* metrics, base::ProcessMetrics* metrics,
v8::Isolate* isolate) { v8::Isolate* isolate) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
int processor_count = base::SysInfo::NumberOfProcessors(); int processor_count = base::SysInfo::NumberOfProcessors();
dict.Set("percentCPUUsage", dict.Set("percentCPUUsage",
metrics->GetPlatformIndependentCPUUsage() / processor_count); metrics->GetPlatformIndependentCPUUsage() / processor_count);
@ -310,7 +306,6 @@ v8::Local<v8::Value> ElectronBindings::GetIOCounters(v8::Isolate* isolate) {
auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics(); auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
base::IoCounters io_counters; base::IoCounters io_counters;
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
if (metrics->GetIOCounters(&io_counters)) { if (metrics->GetIOCounters(&io_counters)) {
dict.Set("readOperationCount", io_counters.ReadOperationCount); dict.Set("readOperationCount", io_counters.ReadOperationCount);

5
shell/common/gin_converters/gfx_converter.cc
View file

@ -18,7 +18,6 @@ namespace gin {
v8::Local<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
const gfx::Point& val) { const gfx::Point& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("x", val.x()); dict.Set("x", val.x());
dict.Set("y", val.y()); dict.Set("y", val.y());
return dict.GetHandle(); return dict.GetHandle();
@ -41,7 +40,6 @@ bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> Converter<gfx::PointF>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<gfx::PointF>::ToV8(v8::Isolate* isolate,
const gfx::PointF& val) { const gfx::PointF& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("x", val.x()); dict.Set("x", val.x());
dict.Set("y", val.y()); dict.Set("y", val.y());
return dict.GetHandle(); return dict.GetHandle();
@ -63,7 +61,6 @@ bool Converter<gfx::PointF>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
const gfx::Size& val) { const gfx::Size& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("width", val.width()); dict.Set("width", val.width());
dict.Set("height", val.height()); dict.Set("height", val.height());
return dict.GetHandle(); return dict.GetHandle();
@ -85,7 +82,6 @@ bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate, v8::Local<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
const gfx::Rect& val) { const gfx::Rect& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("x", val.x()); dict.Set("x", val.x());
dict.Set("y", val.y()); dict.Set("y", val.y());
dict.Set("width", val.width()); dict.Set("width", val.width());
@ -142,7 +138,6 @@ v8::Local<v8::Value> Converter<display::Display>::ToV8(
v8::Isolate* isolate, v8::Isolate* isolate,
const display::Display& val) { const display::Display& val) {
auto dict = gin_helper::Dictionary::CreateEmpty(isolate); auto dict = gin_helper::Dictionary::CreateEmpty(isolate);
dict.SetHidden("simple", true);
dict.Set("id", val.id()); dict.Set("id", val.id());
dict.Set("label", val.label()); dict.Set("label", val.label());
dict.Set("bounds", val.bounds()); dict.Set("bounds", val.bounds());