Changeset 228334 in webkit

Timestamp:

Feb 9, 2018 11:19:41 AM (6 years ago)

Author:

Brent Fulgham

Message:

[macOS, iOS] Expose OS marketing version in UserAgent
​https://bugs.webkit.org/show_bug.cgi?id=182629
<rdar://problem/37370975>

Reviewed by Daniel Bates.

Revert back to dynamically reading the operating system marketing version
rather than using a hard-coded version.

• page/cocoa/UserAgent.mm:

(WebCore::systemMarketingVersionForUserAgentString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/cocoa/UserAgent.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-09  Brent Fulgham  <bfulgham@apple.com>
+
+        [macOS, iOS] Expose OS marketing version in UserAgent
+        https://bugs.webkit.org/show_bug.cgi?id=182629
+        <rdar://problem/37370975>
+
+        Reviewed by Daniel Bates.
+
+        Revert back to dynamically reading the operating system marketing version
+        rather than using a hard-coded version.
+
+        * page/cocoa/UserAgent.mm:
+        (WebCore::systemMarketingVersionForUserAgentString):
+
 2018-02-08  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/page/cocoa/UserAgent.mm

@@ -27 +27 @@
 #import "UserAgent.h"
 
+#import "SystemVersion.h"
+
 namespace WebCore {
 
@@ -34 +36 @@
     // we were concerned about old DHTML libraries interpreting "4." as Netscape 4. That's no longer a concern for us
     // but we're sticking with the underscores for compatibility with the format used by older versions of Safari.
-#if PLATFORM(MAC)
-    return ASCIILiteral("10_13_4");
-#else
-    return ASCIILiteral("11_3");
-#endif
+    return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
 }