Title: [228334] trunk/Source/WebCore
Revision
228334
Author
bfulg...@apple.com
Date
2018-02-09 11:19:41 -0800 (Fri, 09 Feb 2018)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (228333 => 228334)


--- trunk/Source/WebCore/ChangeLog	2018-02-09 19:11:32 UTC (rev 228333)
+++ trunk/Source/WebCore/ChangeLog	2018-02-09 19:19:41 UTC (rev 228334)
@@ -1,3 +1,17 @@
+2018-02-09  Brent Fulgham  <bfulg...@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  <grao...@apple.com>
 
         [Web Animations] Refactor AnimationEffect and KeyframeEffect into AnimationEffectReadOnly, KeyframeEffectReadOnly and KeyframeEffect

Modified: trunk/Source/WebCore/page/cocoa/UserAgent.mm (228333 => 228334)


--- trunk/Source/WebCore/page/cocoa/UserAgent.mm	2018-02-09 19:11:32 UTC (rev 228333)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.mm	2018-02-09 19:19:41 UTC (rev 228334)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "UserAgent.h"
 
+#import "SystemVersion.h"
+
 namespace WebCore {
 
 String systemMarketingVersionForUserAgentString()
@@ -33,11 +35,7 @@
     // Use underscores instead of dots because when we first added the Mac OS X version to the user agent string
     // 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:@"_"];
 }
 
 String userAgentBundleVersion()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to