Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bab0abb2 authored by csagan5's avatar csagan5
Browse files

Minor patch updates for v97

parent b96c1703
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ Restore-Search-Ready-Omnibox-flag.patch
disable-AdsBlockedInfoBar.patch
Bromite-AdBlockUpdaterService.patch
Replace-DoH-probe-domain-with-RIPE-domain.patch
Increase-number-of-autocomplete-matches-from-5-to-10.patch
Increase-number-of-autocomplete-matches-to-10.patch
Disable-requests-for-single-word-Omnibar-searches.patch
Disable-some-signed-exchange-features.patch
Add-flag-to-disable-WebGL.patch
+6 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Include @thestinger's fix for correct charging/unknown values
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
index 840da4b66f62..7879bdb4e0c1 100644
--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -70,46 +70,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
@@ -19,12 +20,12 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 double BatteryManager::chargingTime() {
-  return battery_status_.charging_time();
-  return battery_status_.charging_time().InSecondsF();
+  return 0.0;
 }
 
 double BatteryManager::dischargingTime() {
-  return battery_status_.discharging_time();
-  return battery_status_.discharging_time().InSecondsF();
+  return std::numeric_limits<double>::infinity();
 }
 
@@ -61,3 +62,6 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 void BatteryManager::RegisterWithDispatcher() {
-- 
2.30.2
+6 −4
Original line number Diff line number Diff line
@@ -10,19 +10,21 @@ The size increase on Android is something they care a lot about since some
devices have very little storage space. That also means ever so slightly
higher memory/cache usage but not by the full 2-3%.
---
 build/config/compiler/BUILD.gn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
 build/config/compiler/BUILD.gn | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -335,16 +335,12 @@ config("compiler") {
@@ -338,18 +338,12 @@ config("compiler") {
         cflags += [ "-fstack-protector" ]
       }
     } else if ((is_posix && !is_chromeos_ash && !is_nacl) || is_fuchsia) {
-      # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
-      # See also https://crbug.com/533294
-      if (current_os != "zos") {
-        cflags += [ "--param=ssp-buffer-size=4" ]
-      }
-
       # The x86 toolchain currently has problems with stack-protector.
       if (is_android && current_cpu == "x86") {