<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170735] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170735">170735</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 16:02:45 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecocoaUserAgenth">trunk/Source/WebCore/page/cocoa/UserAgent.h</a></li>
<li><a href="#trunkSourceWebCorepagecocoaUserAgentmm">trunk/Source/WebCore/page/cocoa/UserAgent.mm</a></li>
<li><a href="#trunkSourceWebCorepageiosUserAgentIOSmm">trunk/Source/WebCore/page/ios/UserAgentIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacUserAgentMacmm">trunk/Source/WebCore/page/mac/UserAgentMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170734 => 170735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/ChangeLog        2014-07-02 23:02:45 UTC (rev 170735)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-01 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> <https://webkit.org/b/134522> Remove duplication in code that prepares the user agent string on Mac and iOS
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaUserAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/UserAgent.h (170734 => 170735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/UserAgent.h        2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.h        2014-07-02 23:02:45 UTC (rev 170735)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString);
</span><span class="cx">
</span><span class="cx"> String systemMarketingVersionForUserAgentString();
</span><del>-String userVisibleWebKitBundleVersionFromFullVersion(const String&);
</del><ins>+String userAgentBundleVersionFromFullVersionString(const String&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaUserAgentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/UserAgent.mm (170734 => 170735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/UserAgent.mm        2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.mm        2014-07-02 23:02:45 UTC (rev 170735)
</span><span class="lines">@@ -38,10 +38,8 @@
</span><span class="cx"> return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String userVisibleWebKitBundleVersionFromFullVersion(const String& fullWebKitVersionString)
</del><ins>+static NSString *userVisibleWebKitBundleVersionFromFullVersion(NSString *fullWebKitVersion)
</ins><span class="cx"> {
</span><del>- NSString *fullWebKitVersion = fullWebKitVersionString;
-
</del><span class="cx"> // If the version is longer than 3 digits then the leading digits represent the version of the OS. Our user agent
</span><span class="cx"> // string should not include the leading digits, so strip them off and report the rest as the version. <rdar://problem/4997547>
</span><span class="cx"> NSRange nonDigitRange = [fullWebKitVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
</span><span class="lines">@@ -52,4 +50,23 @@
</span><span class="cx"> return fullWebKitVersion;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosUserAgentIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (170734 => 170735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm        2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm        2014-07-02 23:02:45 UTC (rev 170735)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> CFRelease(override);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSString *webKitVersion = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersionString);
</del><ins>+ NSString *webKitVersion = userAgentBundleVersionFromFullVersionString(fullWebKitVersionString);
</ins><span class="cx"> CFStringRef deviceName = wkGetDeviceName();
</span><span class="cx"> CFStringRef osNameForUserAgent = wkGetOSNameForUserAgent();
</span><span class="cx"> NSString *osMarketingVersionString = systemMarketingVersionForUserAgentString();
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacUserAgentMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/UserAgentMac.mm (170734 => 170735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/UserAgentMac.mm        2014-07-02 23:02:43 UTC (rev 170734)
+++ trunk/Source/WebCore/page/mac/UserAgentMac.mm        2014-07-02 23:02:45 UTC (rev 170735)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> String standardUserAgentWithApplicationName(const String& applicationName, const String& fullWebKitVersionString)
</span><span class="cx"> {
</span><span class="cx"> String osVersion = systemMarketingVersionForUserAgentString();
</span><del>- String webKitVersionString = userVisibleWebKitBundleVersionFromFullVersion(fullWebKitVersionString);
</del><ins>+ String webKitVersionString = userAgentBundleVersionFromFullVersionString(fullWebKitVersionString);
</ins><span class="cx">
</span><span class="cx"> if (applicationName.isEmpty())
</span><span class="cx"> return makeString("Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersionString, " (KHTML, like Gecko)");
</span></span></pre>
</div>
</div>
</body>
</html>