<!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>[176340] trunk/Source/WebKit2</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/176340">176340</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-11-19 14:07:22 -0800 (Wed, 19 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add APIs for customizing the user agent
https://bugs.webkit.org/show_bug.cgi?id=138881
rdar://problem/17233981
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView customUserAgent]):
(-[WKWebView setCustomUserAgent:]):
(-[WKWebView _customUserAgent]):
(-[WKWebView _setCustomUserAgent:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(LazyInitialized::set):
(-[WKWebViewConfiguration copyWithZone:]):
(defaultApplicationNameForUserAgent):
(-[WKWebViewConfiguration applicationNameForUserAgent]):
(-[WKWebViewConfiguration setApplicationNameForUserAgent:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176339 => 176340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-19 22:05:03 UTC (rev 176339)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-19 22:07:22 UTC (rev 176340)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-11-19 Anders Carlsson <andersca@apple.com>
+
+ Add APIs for customizing the user agent
+ https://bugs.webkit.org/show_bug.cgi?id=138881
+ rdar://problem/17233981
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView customUserAgent]):
+ (-[WKWebView setCustomUserAgent:]):
+ (-[WKWebView _customUserAgent]):
+ (-[WKWebView _setCustomUserAgent:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (LazyInitialized::set):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (defaultApplicationNameForUserAgent):
+ (-[WKWebViewConfiguration applicationNameForUserAgent]):
+ (-[WKWebViewConfiguration setApplicationNameForUserAgent:]):
+
</ins><span class="cx"> 2014-11-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2 UI-side compositing] Initialize RemoteLayerTreeTransaction properties which are unset on Mac
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (176339 => 176340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-11-19 22:05:03 UTC (rev 176339)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-11-19 22:07:22 UTC (rev 176340)
</span><span class="lines">@@ -209,6 +209,10 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL allowsBackForwardNavigationGestures;
</span><span class="cx">
</span><ins>+/*! @abstract The custom user agent string or nil if no custom user agent string has been set.
+*/
+@property (nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract The scroll view associated with the web view.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176339 => 176340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-19 22:05:03 UTC (rev 176339)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-19 22:07:22 UTC (rev 176340)
</span><span class="lines">@@ -300,7 +300,6 @@
</span><span class="cx"> _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:context configuration:WTF::move(webPageConfiguration) webView:self]);
</span><span class="cx">
</span><span class="cx"> _page = [_contentView page];
</span><del>- _page->setApplicationNameForUserAgent([@"Mobile/" stringByAppendingString:[UIDevice currentDevice].buildVersion]);
</del><span class="cx"> _page->setDeviceOrientation(deviceOrientation());
</span><span class="cx">
</span><span class="cx"> [_contentView layer].anchorPoint = CGPointZero;
</span><span class="lines">@@ -337,6 +336,9 @@
</span><span class="cx">
</span><span class="cx"> _page->setBackgroundExtendsBeyondPage(true);
</span><span class="cx">
</span><ins>+ if (NSString *applicationNameForUserAgent = configuration.applicationNameForUserAgent)
+ _page->setApplicationNameForUserAgent(applicationNameForUserAgent);
+
</ins><span class="cx"> _navigationState = std::make_unique<WebKit::NavigationState>(self);
</span><span class="cx"> _page->setPolicyClient(_navigationState->createPolicyClient());
</span><span class="cx"> _page->setLoaderClient(_navigationState->createLoaderClient());
</span><span class="lines">@@ -591,6 +593,16 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)customUserAgent
+{
+ return _page->customUserAgent();
+}
+
+- (void)setCustomUserAgent:(NSString *)customUserAgent
+{
+ _page->setCustomUserAgent(customUserAgent);
+}
+
</ins><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -1659,12 +1671,13 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)_customUserAgent
</span><span class="cx"> {
</span><del>- return _page->customUserAgent();
</del><ins>+ return self.customUserAgent;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setCustomUserAgent:(NSString *)_customUserAgent
</del><ins>+- (void)_setCustomUserAgent:(NSString *)customUserAgent
</ins><span class="cx"> {
</span><del>- _page->setCustomUserAgent(_customUserAgent);
</del><ins>+ self.customUserAgent = customUserAgent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (pid_t)_webProcessIdentifier
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (176339 => 176340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-11-19 22:05:03 UTC (rev 176339)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-11-19 22:07:22 UTC (rev 176340)
</span><span class="lines">@@ -77,6 +77,10 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL suppressesIncrementalRendering;
</span><span class="cx">
</span><ins>+/*! @abstract The name of the application as used in the user agent string.
+*/
+@property (nonatomic, copy) NSString *applicationNameForUserAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract A Boolean value indicating whether HTML5 videos play inline
</span><span class="cx"> (YES) or use the native full-screen controller (NO).
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (176339 => 176340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-11-19 22:05:03 UTC (rev 176339)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-11-19 22:07:22 UTC (rev 176340)
</span><span class="lines">@@ -56,6 +56,12 @@
</span><span class="cx"> m_isInitialized = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void set(RetainPtr<T>&& t)
+ {
+ m_value = WTF::move(t);
+ m_isInitialized = true;
+ }
+
</ins><span class="cx"> T* peek()
</span><span class="cx"> {
</span><span class="cx"> return m_value.get();
</span><span class="lines">@@ -75,6 +81,8 @@
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _alternateWebViewForNavigationGestures;
</span><span class="cx"> RetainPtr<NSString> _groupIdentifier;
</span><ins>+ LazyInitialized<NSString> _applicationNameForUserAgent;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
</span><span class="cx"> BOOL _allowsAlternateFullscreen;
</span><span class="lines">@@ -116,6 +124,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> configuration->_suppressesIncrementalRendering = self->_suppressesIncrementalRendering;
</span><ins>+ configuration.applicationNameForUserAgent = self.applicationNameForUserAgent;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="cx"> configuration->_allowsAlternateFullscreen = self->_allowsAlternateFullscreen;
</span><span class="lines">@@ -157,6 +167,25 @@
</span><span class="cx"> _userContentController.set(userContentController);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NSString *defaultApplicationNameForUserAgent()
+{
+#if PLATFORM(IOS)
+ return [@"Mobile/" stringByAppendingString:[UIDevice currentDevice].buildVersion];
+#else
+ return nil;
+#endif
+}
+
+- (NSString *)applicationNameForUserAgent
+{
+ return _applicationNameForUserAgent.get([] { return defaultApplicationNameForUserAgent(); });
+}
+
+- (void)setApplicationNameForUserAgent:(NSString *)applicationNameForUserAgent
+{
+ _applicationNameForUserAgent.set(adoptNS([applicationNameForUserAgent copy]));
+}
+
</ins><span class="cx"> - (_WKVisitedLinkProvider *)_visitedLinkProvider
</span><span class="cx"> {
</span><span class="cx"> return _visitedLinkProvider.get([] { return adoptNS([[_WKVisitedLinkProvider alloc] init]); });
</span></span></pre>
</div>
</div>
</body>
</html>