Changeset 288451 in webkit

Timestamp:

Jan 24, 2022, 9:44:12 AM (4 years ago)

Author:

david_quesada@apple.com

Message:

Simplify accesses to SystemVersion.plist
​https://bugs.webkit.org/show_bug.cgi?id=234306

Reviewed by Alexey Proskuryakov.

Source/WebCore:

No new tests since no behavior change is expected.

• platform/cocoa/SystemVersion.mm:

(WebCore::createSystemMarketingVersion):

Read the SystemVersion.plist file using _CFCopySystemVersionDictionary()
rather than by manually constructing the path and initializing the dictionary.

Source/WebCore/PAL:

• pal/spi/cf/CFUtilitiesSPI.h:

Forward declare _kCFSystemVersionProductUserVisibleVersionKey, used
by WebCore's SystemVersion.mm

Source/WebKit:

No new tests since no behavior change is expected.

• UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm:

(WebKit::WebInspectorUIProxy::infoForLocalDebuggable):

Use _CFCopySystemVersionDictionary() to locate and load the
SystemVersion.plist file rather than doing that all manually.

(WebKit::systemVersionPlist): Deleted.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFUtilitiesSPI.h (modified) (1 diff)
• WebCore/platform/cocoa/SystemVersion.mm (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-24  David Quesada  <david_quesada@apple.com>
+
+        Simplify accesses to SystemVersion.plist
+        https://bugs.webkit.org/show_bug.cgi?id=234306
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests since no behavior change is expected.
+
+        * platform/cocoa/SystemVersion.mm:
+        (WebCore::createSystemMarketingVersion):
+            Read the SystemVersion.plist file using _CFCopySystemVersionDictionary()
+            rather than by manually constructing the path and initializing the dictionary.
+
 2022-01-24  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2022-01-24  David Quesada  <david_quesada@apple.com>
+
+        Simplify accesses to SystemVersion.plist
+        https://bugs.webkit.org/show_bug.cgi?id=234306
+
+        Reviewed by Alexey Proskuryakov.
+
+        * pal/spi/cf/CFUtilitiesSPI.h:
+            Forward declare _kCFSystemVersionProductUserVisibleVersionKey, used
+            by WebCore's SystemVersion.mm
+
 2022-01-21  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFUtilitiesSPI.h

@@ -50 +50 @@
 extern const CFStringRef kCFWebServicesTypeWebSearch;
 extern const CFStringRef _kCFSystemVersionBuildVersionKey;
+extern const CFStringRef _kCFSystemVersionProductUserVisibleVersionKey;
 extern const CFStringRef _kCFSystemVersionProductVersionKey;
 

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

@@ -25 +25 @@
 #import "config.h"
 #import "SystemVersion.h"
+#import <pal/spi/cf/CFUtilitiesSPI.h>
 
 namespace WebCore {
@@ -31 +32 @@
 {
     // Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
-    NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, YES) objectAtIndex:0];
-#if PLATFORM(IOS_FAMILY_SIMULATOR)
-    if (char *simulatorRoot = getenv("SIMULATOR_ROOT"))
-        systemLibraryPath = [NSString stringWithFormat:@"%s/%@", simulatorRoot, systemLibraryPath];
-#endif
-    NSString *systemVersionPlistPath = [systemLibraryPath stringByAppendingPathComponent:@"CoreServices/SystemVersion.plist"];
-    NSDictionary *systemVersionInfo = [NSDictionary dictionaryWithContentsOfFile:systemVersionPlistPath];
-    return adoptNS([[systemVersionInfo objectForKey:@"ProductVersion"] copy]);
+    auto systemVersionDictionary = adoptCF(_CFCopySystemVersionDictionary());
+    CFStringRef productVersion = static_cast<CFStringRef>(CFDictionaryGetValue(systemVersionDictionary.get(), _kCFSystemVersionProductVersionKey));
+    return adoptNS([(__bridge NSString *)productVersion copy]);
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-24  David Quesada  <david_quesada@apple.com>
+
+        Simplify accesses to SystemVersion.plist
+        https://bugs.webkit.org/show_bug.cgi?id=234306
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests since no behavior change is expected.
+
+        * UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm:
+        (WebKit::WebInspectorUIProxy::infoForLocalDebuggable):
+            Use _CFCopySystemVersionDictionary() to locate and load the
+            SystemVersion.plist file rather than doing that all manually.
+        (WebKit::systemVersionPlist): Deleted.
+
 2022-01-24  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm

@@ -49 +49 @@
 #import <WebCore/InspectorFrontendClientLocal.h>
 #import <WebCore/LocalizedStrings.h>
+#import <pal/spi/cf/CFUtilitiesSPI.h>
 #import <wtf/text/Base64.h>
 
@@ -788 +789 @@
 }
 
-static NSDictionary *systemVersionPlist()
-{
-    NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, YES) objectAtIndex:0];
-    NSString *systemVersionPlistPath = [systemLibraryPath stringByAppendingPathComponent:@"CoreServices/SystemVersion.plist"];
-    NSDictionary *systemVersionInfo = [NSDictionary dictionaryWithContentsOfFile:systemVersionPlistPath];
-    return systemVersionInfo;
-}
-
 DebuggableInfoData WebInspectorUIProxy::infoForLocalDebuggable()
 {
-    NSDictionary *plist = systemVersionPlist();
+    NSDictionary *plist = adoptCF(_CFCopySystemVersionDictionary()).bridgingAutorelease();
 
     DebuggableInfoData result;
     result.debuggableType = Inspector::DebuggableType::WebPage;
     result.targetPlatformName = "macOS"_s;
-    result.targetBuildVersion = plist[@"ProductBuildVersion"];
-    result.targetProductVersion = plist[@"ProductUserVisibleVersion"];
+    result.targetBuildVersion = plist[static_cast<NSString *>(_kCFSystemVersionBuildVersionKey)];
+    result.targetProductVersion = plist[static_cast<NSString *>(_kCFSystemVersionProductUserVisibleVersionKey)];
     result.targetIsSimulator = false;