<!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>[170734] trunk/Source</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/170734">170734</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 16:02:43 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/134522> Remove duplication in code that prepares the user agent string on Mac and iOS
Reviewed by Simon Fraser.
Source/WebCore:
* page/cocoa/UserAgent.h:
* page/cocoa/UserAgent.mm:
(WebCore::userVisibleWebKitBundleVersionFromFullVersion): Moved from WebKit2.
* page/ios/UserAgentIOS.mm:
(WebCore::standardUserAgentWithApplicationName): Pass the WebKit bundle version through userVisibleWebKitBundleVersionFromFullVersion
before including it in the user agent string.
* page/mac/UserAgentMac.mm:
(WebCore::standardUserAgentWithApplicationName): Ditto.
Source/WebKit/mac:
* WebView/WebView.mm:
(webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
(+[WebView _standardUserAgentWithApplicationName:]):
Source/WebKit2:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
(WebKit::WebPageProxy::standardUserAgent):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::webKitBundleVersionString): Ditto.
(WebKit::WebPageProxy::standardUserAgent):</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>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-01 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/134522> Remove duplication in code that prepares the user agent string on Mac and iOS
+
+ Reviewed by Simon Fraser.
+
+ * page/cocoa/UserAgent.h:
+ * page/cocoa/UserAgent.mm:
+ (WebCore::userVisibleWebKitBundleVersionFromFullVersion): Moved from WebKit2.
+ * page/ios/UserAgentIOS.mm:
+ (WebCore::standardUserAgentWithApplicationName): Pass the WebKit bundle version through userVisibleWebKitBundleVersionFromFullVersion
+ before including it in the user agent string.
+ * page/mac/UserAgentMac.mm:
+ (WebCore::standardUserAgentWithApplicationName): Ditto.
+
</ins><span class="cx"> 2014-07-02 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/134521> iOS should use shared code to determine the system marketing version
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaUserAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/UserAgent.h (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.h 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -29,8 +29,12 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+
</ins><span class="cx"> String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString);
</span><ins>+
</ins><span class="cx"> String systemMarketingVersionForUserAgentString();
</span><ins>+String userVisibleWebKitBundleVersionFromFullVersion(const String&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // UserAgent_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaUserAgentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/UserAgent.mm (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/cocoa/UserAgent.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -38,4 +38,18 @@
</span><span class="cx"> return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String userVisibleWebKitBundleVersionFromFullVersion(const String& fullWebKitVersionString)
+{
+ 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>
+ NSRange nonDigitRange = [fullWebKitVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
+ if (nonDigitRange.location == NSNotFound && fullWebKitVersion.length > 3)
+ return [fullWebKitVersion substringFromIndex:fullWebKitVersion.length - 3];
+ if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
+ return [fullWebKitVersion substringFromIndex:nonDigitRange.location - 3];
+ return fullWebKitVersion;
+}
+
</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 (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-String standardUserAgentWithApplicationName(const String& applicationName, const String& webkitVersionString)
</del><ins>+String standardUserAgentWithApplicationName(const String& applicationName, const String& fullWebKitVersionString)
</ins><span class="cx"> {
</span><span class="cx"> if (CFStringRef overrideUserAgent = wkGetUserAgent())
</span><span class="cx"> return overrideUserAgent;
</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 = webkitVersionString;
</del><ins>+ NSString *webKitVersion = userVisibleWebKitBundleVersionFromFullVersion(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 (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/UserAgentMac.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebCore/page/mac/UserAgentMac.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -38,9 +38,10 @@
</span><span class="cx"> #error Unknown architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-String standardUserAgentWithApplicationName(const String& applicationName, const String& webKitVersionString)
</del><ins>+String standardUserAgentWithApplicationName(const String& applicationName, const String& fullWebKitVersionString)
</ins><span class="cx"> {
</span><span class="cx"> String osVersion = systemMarketingVersionForUserAgentString();
</span><ins>+ String webKitVersionString = userVisibleWebKitBundleVersionFromFullVersion(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>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-01 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/134522> Remove duplication in code that prepares the user agent string on Mac and iOS
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebView.mm:
+ (webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
+ (+[WebView _standardUserAgentWithApplicationName:]):
+
</ins><span class="cx"> 2014-07-02 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some code only needed for versions of Safari that are no longer supported
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -677,22 +677,14 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebView (WebPrivate)
</span><span class="cx">
</span><del>-static String userVisibleWebKitVersionString()
</del><ins>+static String webKitBundleVersionString()
</ins><span class="cx"> {
</span><del>- // 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>
- NSString *fullVersion = [[NSBundle bundleForClass:[WebView class]] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
- NSRange nonDigitRange = [fullVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
- if (nonDigitRange.location == NSNotFound && fullVersion.length > 3)
- return [fullVersion substringFromIndex:fullVersion.length - 3];
- if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
- return [fullVersion substringFromIndex:nonDigitRange.location - 3];
- return fullVersion;
</del><ins>+ return [[NSBundle bundleForClass:[WebView class]] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSString *)_standardUserAgentWithApplicationName:(NSString *)applicationName
</span><span class="cx"> {
</span><del>- return standardUserAgentWithApplicationName(applicationName, userVisibleWebKitVersionString());
</del><ins>+ return standardUserAgentWithApplicationName(applicationName, webKitBundleVersionString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-01 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/134522> Remove duplication in code that prepares the user agent string on Mac and iOS
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::webKitBundleVersionString): Return the entire CFBundleVersion now that WebCore handles formatting it.
+ (WebKit::WebPageProxy::standardUserAgent):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::webKitBundleVersionString): Ditto.
+ (WebKit::WebPageProxy::standardUserAgent):
+
</ins><span class="cx"> 2014-06-28 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Restrict network process sandbox
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -61,22 +61,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String userVisibleWebKitVersionString()
</del><ins>+static String webKitBundleVersionString()
</ins><span class="cx"> {
</span><del>- // 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>
- NSString *fullVersion = [[NSBundle bundleForClass:NSClassFromString(@"WKView")] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
- NSRange nonDigitRange = [fullVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
- if (nonDigitRange.location == NSNotFound && fullVersion.length > 3)
- return [fullVersion substringFromIndex:fullVersion.length - 3];
- if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
- return [fullVersion substringFromIndex:nonDigitRange.location - 3];
- return fullVersion;
</del><ins>+ return [[NSBundle bundleForClass:NSClassFromString(@"WKWebView")] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String WebPageProxy::standardUserAgent(const String& applicationName)
</del><ins>+String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)
</ins><span class="cx"> {
</span><del>- return standardUserAgentWithApplicationName(applicationName, userVisibleWebKitVersionString());
</del><ins>+ return standardUserAgentWithApplicationName(applicationNameForUserAgent, webKitBundleVersionString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getIsSpeaking(bool&)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (170733 => 170734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-07-02 22:54:32 UTC (rev 170733)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-07-02 23:02:43 UTC (rev 170734)
</span><span class="lines">@@ -97,22 +97,14 @@
</span><span class="cx"> setShouldUseImplicitRubberBandControl(clientExpectsLegacyImplicitRubberBandControl);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String userVisibleWebKitVersionString()
</del><ins>+static String webKitBundleVersionString()
</ins><span class="cx"> {
</span><del>- // 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>
- NSString *fullVersion = [[NSBundle bundleForClass:NSClassFromString(@"WKView")] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
- NSRange nonDigitRange = [fullVersion rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]];
- if (nonDigitRange.location == NSNotFound && fullVersion.length > 3)
- return [fullVersion substringFromIndex:fullVersion.length - 3];
- if (nonDigitRange.location != NSNotFound && nonDigitRange.location > 3)
- return [fullVersion substringFromIndex:nonDigitRange.location - 3];
- return fullVersion;
</del><ins>+ return [[NSBundle bundleForClass:NSClassFromString(@"WKView")] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)
</span><span class="cx"> {
</span><del>- return standardUserAgentWithApplicationName(applicationNameForUserAgent, userVisibleWebKitVersionString());
</del><ins>+ return standardUserAgentWithApplicationName(applicationNameForUserAgent, webKitBundleVersionString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getIsSpeaking(bool& isSpeaking)
</span></span></pre>
</div>
</div>
</body>
</html>