Changeset 259827 in webkit

Timestamp:

Apr 9, 2020, 2:04:46 PM (6 years ago)

Author:

pvollan@apple.com

Message:

[Cocoa] The function WebCore::systemHasBattery() should cache the result.
​https://bugs.webkit.org/show_bug.cgi?id=210296
<rdar://problem/61331536>

Reviewed by Darin Adler.

The function WebCore::systemHasBattery() should cache the result, since the return value of this function
will be the same on a specific device.

No new tests, since there is no change in behavior.

• platform/cocoa/SystemBattery.mm:

(WebCore::systemHasBattery):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cocoa/SystemBattery.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-09  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] The function WebCore::systemHasBattery() should cache the result.
+        https://bugs.webkit.org/show_bug.cgi?id=210296
+        <rdar://problem/61331536>
+
+        Reviewed by Darin Adler.
+
+        The function WebCore::systemHasBattery() should cache the result, since the return value of this function
+        will be the same on a specific device.
+
+        No new tests, since there is no change in behavior.
+
+        * platform/cocoa/SystemBattery.mm:
+        (WebCore::systemHasBattery):
+
 2020-04-09  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebCore/platform/cocoa/SystemBattery.mm

@@ -40 +40 @@
 bool systemHasBattery()
 {
-    if (hasBattery.hasValue())
-        return *hasBattery;
+    if (!hasBattery.hasValue()) {
+        hasBattery = [] {
+            RetainPtr<CFTypeRef> powerSourcesInfo = adoptCF(IOPSCopyPowerSourcesInfo());
+            if (!powerSourcesInfo)
+                return false;
+            RetainPtr<CFArrayRef> powerSourcesList = adoptCF(IOPSCopyPowerSourcesList(powerSourcesInfo.get()));
+            if (!powerSourcesList)
+                return false;
+            for (CFIndex i = 0, count = CFArrayGetCount(powerSourcesList.get()); i < count; ++i) {
+                CFDictionaryRef description = IOPSGetPowerSourceDescription(powerSourcesInfo.get(), CFArrayGetValueAtIndex(powerSourcesList.get(), i));
+                CFTypeRef value = CFDictionaryGetValue(description, CFSTR(kIOPSTypeKey));
+                if (!value || CFEqual(value, CFSTR(kIOPSInternalBatteryType)))
+                    return true;
+            }
+            return false;
+        }();
+    }
 
-    RetainPtr<CFTypeRef> powerSourcesInfo = adoptCF(IOPSCopyPowerSourcesInfo());
-    if (!powerSourcesInfo)
-        return false;
-    RetainPtr<CFArrayRef> powerSourcesList = adoptCF(IOPSCopyPowerSourcesList(powerSourcesInfo.get()));
-    if (!powerSourcesList)
-        return false;
-    for (CFIndex i = 0, count = CFArrayGetCount(powerSourcesList.get()); i < count; ++i) {
-        CFDictionaryRef description = IOPSGetPowerSourceDescription(powerSourcesInfo.get(), CFArrayGetValueAtIndex(powerSourcesList.get(), i));
-        CFTypeRef value = CFDictionaryGetValue(description, CFSTR(kIOPSTypeKey));
-        if (!value || CFEqual(value, CFSTR(kIOPSInternalBatteryType)))
-            return true;
-    }
-    return false;
+    return *hasBattery;
 }