<!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>[168637] 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/168637">168637</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 12:53:28 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebViewConfiguration should fill in the blanks
https://bugs.webkit.org/show_bug.cgi?id=132832
<rdar://problem/16886408>
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration _validate]):
* UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168636 => 168637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-12 19:47:12 UTC (rev 168636)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-12 19:53:28 UTC (rev 168637)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-05-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKWebViewConfiguration should fill in the blanks
+ https://bugs.webkit.org/show_bug.cgi?id=132832
+ <rdar://problem/16886408>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration _validate]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h:
+
+2014-05-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WKWebView should default to _backgroundExtendsBeyondPage = YES
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132829
</span><span class="cx"> <rdar://problem/16886364>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168636 => 168637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-12 19:47:12 UTC (rev 168636)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-12 19:53:28 UTC (rev 168637)
</span><span class="lines">@@ -154,26 +154,8 @@
</span><span class="cx"> [_configuration setProcessPool:relatedWebViewProcessPool];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (![_configuration processPool])
- [_configuration setProcessPool:adoptNS([[WKProcessPool alloc] init]).get()];
</del><ins>+ [_configuration _validate];
</ins><span class="cx">
</span><del>- if (![_configuration preferences])
- [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
-
- if (![_configuration userContentController])
- [_configuration setUserContentController:adoptNS([[WKUserContentController alloc] init]).get()];
-
- if (![_configuration _visitedLinkProvider])
- [_configuration _setVisitedLinkProvider:adoptNS([[_WKVisitedLinkProvider alloc] init]).get()];
-
- if (![_configuration _websiteDataStore])
- [_configuration _setWebsiteDataStore:[_WKWebsiteDataStore defaultDataStore]];
-
-#if PLATFORM(IOS)
- if (![_configuration _contentProviderRegistry])
- [_configuration _setContentProviderRegistry:adoptNS([[WKWebViewContentProviderRegistry alloc] init]).get()];
-#endif
-
</del><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="cx"> WebKit::WebContext& context = *[_configuration processPool]->_context;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (168636 => 168637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-05-12 19:47:12 UTC (rev 168636)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-05-12 19:53:28 UTC (rev 168637)
</span><span class="lines">@@ -44,20 +44,14 @@
</span><span class="cx"> @discussion When the @link WKWebView @/link is initialized with the configuration, a new Web
</span><span class="cx"> Content process from the specified pool will be created for it, or an existing process in
</span><span class="cx"> that pool will be used.
</span><del>- When this property is set to nil, a unique process pool will be created for each
- @link WKWebView @/link initialized with the configuration.
</del><span class="cx"> */
</span><span class="cx"> @property (nonatomic, strong) WKProcessPool *processPool;
</span><span class="cx">
</span><span class="cx"> /*! @abstract The preferences that should be used by web views created with this configuration.
</span><del>- @discussion When this property is set to nil, a unique preferences object will be created for each
- @link WKWebView @/link initialized with the configuration.
</del><span class="cx"> */
</span><span class="cx"> @property (nonatomic, strong) WKPreferences *preferences;
</span><span class="cx">
</span><span class="cx"> /*! @abstract The user content controller that should be used by web views created with this configuration.
</span><del>- @discussion When this property is set to nil, a unique user content controller object will be created for each
- @link WKWebView @/link initialized with the configuration.
</del><span class="cx"> */
</span><span class="cx"> @property (nonatomic, strong) WKUserContentController *userContentController;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (168636 => 168637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-05-12 19:47:12 UTC (rev 168636)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-05-12 19:53:28 UTC (rev 168637)
</span><span class="lines">@@ -28,9 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WKPreferences.h"
+#import "WKProcessPool.h"
</ins><span class="cx"> #import "WKUserContentController.h"
</span><span class="cx"> #import "WKWebViewContentProviderRegistry.h"
</span><span class="cx"> #import "WeakObjCPtr.h"
</span><ins>+#import "_WKVisitedLinkProvider.h"
</ins><span class="cx"> #import "_WKWebsiteDataStore.h"
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -47,6 +50,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (instancetype)init
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _processPool = adoptNS([[WKProcessPool alloc] init]);
+ _preferences = adoptNS([[WKPreferences alloc] init]);
+ _userContentController = adoptNS([[WKUserContentController alloc] init]);
+ _visitedLinkProvider = adoptNS([[_WKVisitedLinkProvider alloc] init]);
+ _websiteDataStore = [_WKWebsiteDataStore defaultDataStore];
+
+#if PLATFORM(IOS)
+ _contentProviderRegistry = adoptNS([[WKWebViewContentProviderRegistry alloc] init]);
+#endif
+
+ return self;
+}
+
</ins><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><span class="cx"> return [NSString stringWithFormat:@"<%@: %p; processPool = %@; preferences = %@>", NSStringFromClass(self.class), self, _processPool.get(), _preferences.get()];
</span><span class="lines">@@ -131,6 +152,29 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (void)_validate
+{
+ if (!_processPool)
+ [NSException raise:NSInvalidArgumentException format:@"configuration.processPool is nil"];
+
+ if (!_preferences)
+ [NSException raise:NSInvalidArgumentException format:@"configuration.preferences is nil"];
+
+ if (!_userContentController)
+ [NSException raise:NSInvalidArgumentException format:@"configuration.userContentController is nil"];
+
+ if (!_visitedLinkProvider)
+ [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkProvider is nil"];
+
+ if (!_websiteDataStore)
+ [NSException raise:NSInvalidArgumentException format:@"configuration._websiteDataStore is nil"];
+
+#if PLATFORM(IOS)
+ if (!_contentProviderRegistry)
+ [NSException raise:NSInvalidArgumentException format:@"configuration._contentProviderRegistry is nil"];
+#endif
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKWebViewConfiguration (WKPrivate)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h (168636 => 168637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h 2014-05-12 19:47:12 UTC (rev 168636)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h 2014-05-12 19:53:28 UTC (rev 168637)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> @property (nonatomic, setter=_setContentProviderRegistry:) WKWebViewContentProviderRegistry *_contentProviderRegistry;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (void)_validate;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>