<!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>[165410] tags/Safari-538.22/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/165410">165410</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-03-10 15:49:04 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/165398">r165398</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53822SourceWebKit2ChangeLog">tags/Safari-538.22/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewmm">tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53822SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.22/Source/WebKit2/ChangeLog (165409 => 165410)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.22/Source/WebKit2/ChangeLog 2014-03-10 22:48:42 UTC (rev 165409)
+++ tags/Safari-538.22/Source/WebKit2/ChangeLog 2014-03-10 22:49:04 UTC (rev 165410)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-10 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165398
+
+ 2014-03-10 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/16278716> [Cocoa] Allow setting a custom group identifier on a WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=130033
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]): Create a page group with the group identifier
+ from the configuration, if it’s non-empty.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _groupIdentifier]): Added this accessor.
+ (-[WKWebViewConfiguration _setGroupIdentifier:]): Ditto.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declared _groupIdentifier property.
+
</ins><span class="cx"> 2014-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] The web process can finish while a print operation is still ongoing
</span></span></pre></div>
<a id="tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165409 => 165410)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-10 22:48:42 UTC (rev 165409)
+++ tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-10 22:49:04 UTC (rev 165410)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span><ins>+#import "WebPageGroup.h"
</ins><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="lines">@@ -152,6 +153,13 @@
</span><span class="cx">
</span><span class="cx"> webPageConfiguration.visitedLinkProvider = [_configuration visitedLinkProvider]->_visitedLinkProvider.get();
</span><span class="cx">
</span><ins>+ RefPtr<WebKit::WebPageGroup> pageGroup;
+ NSString *groupIdentifier = configuration._groupIdentifier;
+ if (groupIdentifier.length) {
+ pageGroup = WebKit::WebPageGroup::create(configuration._groupIdentifier);
+ webPageConfiguration.pageGroup = pageGroup.get();
+ }
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span><span class="cx"> [_scrollView setInternalDelegate:self];
</span></span></pre></div>
<a id="tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (165409 => 165410)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-03-10 22:48:42 UTC (rev 165409)
+++ tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-03-10 22:49:04 UTC (rev 165410)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> RetainPtr<WKPreferences> _preferences;
</span><span class="cx"> RetainPtr<WKVisitedLinkProvider> _visitedLinkProvider;
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><ins>+ RetainPtr<NSString> _groupIdentifier;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<WKWebViewContentProviderRegistry> _contentProviderRegistry;
</span><span class="cx"> #endif
</span><span class="lines">@@ -91,6 +92,22 @@
</span><span class="cx"> _visitedLinkProvider = visitedLinkProvider;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+- (WKWebViewContentProviderRegistry *)_contentProviderRegistry
+{
+ return _contentProviderRegistry.get();
+}
+
+- (void)_setContentProviderRegistry:(WKWebViewContentProviderRegistry *)registry
+{
+ _contentProviderRegistry = registry;
+}
+#endif
+
+@end
+
+@implementation WKWebViewConfiguration (WKPrivate)
+
</ins><span class="cx"> - (WKWebView *)_relatedWebView
</span><span class="cx"> {
</span><span class="cx"> return _relatedWebView.getAutoreleased();
</span><span class="lines">@@ -101,17 +118,15 @@
</span><span class="cx"> _relatedWebView = relatedWebView;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-- (WKWebViewContentProviderRegistry *)_contentProviderRegistry
</del><ins>+- (NSString *)_groupIdentifier
</ins><span class="cx"> {
</span><del>- return _contentProviderRegistry.get();
</del><ins>+ return _groupIdentifier.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setContentProviderRegistry:(WKWebViewContentProviderRegistry *)registry
</del><ins>+- (void)_setGroupIdentifier:(NSString *)groupIdentifier
</ins><span class="cx"> {
</span><del>- _contentProviderRegistry = registry;
</del><ins>+ _groupIdentifier = groupIdentifier;
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari53822SourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (165409 => 165410)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-03-10 22:48:42 UTC (rev 165409)
+++ tags/Safari-538.22/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-03-10 22:49:04 UTC (rev 165410)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> @interface WKWebViewConfiguration (WKPrivate)
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, weak, setter=_setRelatedWebView:) WKWebView *_relatedWebView;
</span><ins>+@property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>