Changeset 170735 in webkit

Timestamp:

Jul 2, 2014 4:02:45 PM (10 years ago)

Author:

mrowe@apple.com

Message:

Ensure that the WebKit bundle version in the user agent string continues to match the current format.
<​https://webkit.org/b/134524> / <rdar://problem/17447771>

Reviewed by Simon Fraser.

• page/cocoa/UserAgent.h:
• page/cocoa/UserAgent.mm:

(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Updated to take an NSString now that it's internal
to the file.
(WebCore::userAgentBundleVersionFromFullVersionString): Limit the bundle version included in the user agent
string to three components.

• page/ios/UserAgentIOS.mm:

(WebCore::standardUserAgentWithApplicationName): Update to call userAgentBundleVersionFromFullVersionString.

• page/mac/UserAgentMac.mm:

(WebCore::standardUserAgentWithApplicationName): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/cocoa/UserAgent.h (modified) (1 diff)
• page/cocoa/UserAgent.mm (modified) (2 diffs)
• page/ios/UserAgentIOS.mm (modified) (1 diff)
• page/mac/UserAgentMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-01  Mark Rowe  <mrowe@apple.com>
+
+        Ensure that the WebKit bundle version in the user agent string continues to match the current format.
+        <https://webkit.org/b/134524> / <rdar://problem/17447771>
+
+        Reviewed by Simon Fraser.
+
+        * page/cocoa/UserAgent.h:
+        * page/cocoa/UserAgent.mm:
+        (WebCore::userVisibleWebKitBundleVersionFromFullVersion): Updated to take an NSString now that it's internal
+        to the file.
+        (WebCore::userAgentBundleVersionFromFullVersionString): Limit the bundle version included in the user agent
+        string to three components.
+        * page/ios/UserAgentIOS.mm:
+        (WebCore::standardUserAgentWithApplicationName): Update to call userAgentBundleVersionFromFullVersionString.
+        * page/mac/UserAgentMac.mm:
+        (WebCore::standardUserAgentWithApplicationName): Ditto.
+
 2014-07-01  Mark Rowe  <mrowe@apple.com>
 

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

@@ -34 +34 @@
 
 String systemMarketingVersionForUserAgentString();
-String userVisibleWebKitBundleVersionFromFullVersion(const String&);
+String userAgentBundleVersionFromFullVersionString(const String&);
 
 }

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

@@ -39 +39 @@
 }
 
-String userVisibleWebKitBundleVersionFromFullVersion(const String& fullWebKitVersionString)
+static NSString *userVisibleWebKitBundleVersionFromFullVersion(NSString *fullWebKitVersion)
 {
-    NSString *fullWebKitVersion = fullWebKitVersionString;
-
     // If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
     // string should not include the leading digits, so strip them off and report the rest as the version. <rdar://problem/4997547>
@@ -53 +51 @@
 }
 
+String userAgentBundleVersionFromFullVersionString(const String& fullWebKitVersion)
+{
+    // We include at most three components of the bundle version in the user agent string.
+    NSString *bundleVersion = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersion);
+    NSScanner *scanner = [NSScanner scannerWithString:bundleVersion];
+    NSInteger periodCount = 0;
+    while (true) {
+        if (![scanner scanUpToString:@"." intoString:nullptr] || scanner.isAtEnd)
+            return bundleVersion;
+
+        if (++periodCount == 3)
+            return [bundleVersion substringToIndex:scanner.scanLocation];
+
+        ++scanner.scanLocation;
+    }
+
+    ASSERT_NOT_REACHED();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/ios/UserAgentIOS.mm

@@ -45 +45 @@
     }
 
-    NSString *webKitVersion = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersionString);
+    NSString *webKitVersion = userAgentBundleVersionFromFullVersionString(fullWebKitVersionString);
     CFStringRef deviceName = wkGetDeviceName();
     CFStringRef osNameForUserAgent = wkGetOSNameForUserAgent();

trunk/Source/WebCore/page/mac/UserAgentMac.mm

@@ -42 +42 @@
 {
     String osVersion = systemMarketingVersionForUserAgentString();
-    String webKitVersionString = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersionString);
+    String webKitVersionString = userAgentBundleVersionFromFullVersionString(fullWebKitVersionString);
 
     if (applicationName.isEmpty())