<!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>[169351] 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/169351">169351</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-26 09:40:44 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initialize WKWebViewConfiguration ivars lazily
https://bugs.webkit.org/show_bug.cgi?id=133270
<rdar://problem/17027606>
Reviewed by Sam Weinig.
Create a LazyInitialized class template and use it to lazily initialize WKWebViewConfiguration properties.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(LazyInitialized::get):
Initialize m_value with the given function if it hasn't been initialized already.
(LazyInitialized::set):
Update m_value and set m_isInitialized to true.
(LazyInitialized::peek):
Return m_value without initializing it.
(-[WKWebViewConfiguration description]):
Use getters so we'll initialize variables if needed.
(-[WKWebViewConfiguration copyWithZone:]):
Ditto.
(-[WKWebViewConfiguration processPool]):
(-[WKWebViewConfiguration setProcessPool:]):
(-[WKWebViewConfiguration preferences]):
(-[WKWebViewConfiguration setPreferences:]):
(-[WKWebViewConfiguration userContentController]):
(-[WKWebViewConfiguration setUserContentController:]):
(-[WKWebViewConfiguration _visitedLinkProvider]):
(-[WKWebViewConfiguration _setVisitedLinkProvider:]):
(-[WKWebViewConfiguration _websiteDataStore]):
(-[WKWebViewConfiguration _setWebsiteDataStore:]):
(-[WKWebViewConfiguration _contentProviderRegistry]):
(-[WKWebViewConfiguration _setContentProviderRegistry:]):
Pass initialization code to all getters.
(-[WKWebViewConfiguration _validate]):
Use getters.
(-[WKWebViewConfiguration init]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (169350 => 169351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-26 16:37:59 UTC (rev 169350)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-26 16:40:44 UTC (rev 169351)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-05-25 Anders Carlsson <andersca@apple.com>
+
+ Initialize WKWebViewConfiguration ivars lazily
+ https://bugs.webkit.org/show_bug.cgi?id=133270
+ <rdar://problem/17027606>
+
+ Reviewed by Sam Weinig.
+
+ Create a LazyInitialized class template and use it to lazily initialize WKWebViewConfiguration properties.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (LazyInitialized::get):
+ Initialize m_value with the given function if it hasn't been initialized already.
+
+ (LazyInitialized::set):
+ Update m_value and set m_isInitialized to true.
+
+ (LazyInitialized::peek):
+ Return m_value without initializing it.
+
+ (-[WKWebViewConfiguration description]):
+ Use getters so we'll initialize variables if needed.
+
+ (-[WKWebViewConfiguration copyWithZone:]):
+ Ditto.
+
+ (-[WKWebViewConfiguration processPool]):
+ (-[WKWebViewConfiguration setProcessPool:]):
+ (-[WKWebViewConfiguration preferences]):
+ (-[WKWebViewConfiguration setPreferences:]):
+ (-[WKWebViewConfiguration userContentController]):
+ (-[WKWebViewConfiguration setUserContentController:]):
+ (-[WKWebViewConfiguration _visitedLinkProvider]):
+ (-[WKWebViewConfiguration _setVisitedLinkProvider:]):
+ (-[WKWebViewConfiguration _websiteDataStore]):
+ (-[WKWebViewConfiguration _setWebsiteDataStore:]):
+ (-[WKWebViewConfiguration _contentProviderRegistry]):
+ (-[WKWebViewConfiguration _setContentProviderRegistry:]):
+ Pass initialization code to all getters.
+
+ (-[WKWebViewConfiguration _validate]):
+ Use getters.
+
+ (-[WKWebViewConfiguration init]): Deleted.
+
</ins><span class="cx"> 2014-05-26 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove WebKit2 framework from generate-forwarding-headers.pl
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (169350 => 169351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-05-26 16:37:59 UTC (rev 169350)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-05-26 16:40:44 UTC (rev 169351)
</span><span class="lines">@@ -37,54 +37,65 @@
</span><span class="cx"> #import "_WKWebsiteDataStore.h"
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><ins>+template<typename T> class LazyInitialized {
+public:
+ template<typename F>
+ T* get(F&& f)
+ {
+ if (!m_isInitialized) {
+ m_value = f();
+ m_isInitialized = true;
+ }
+
+ return m_value.get();
+ }
+
+ void set(T* t)
+ {
+ m_value = t;
+ m_isInitialized = true;
+ }
+
+ T* peek()
+ {
+ return m_value.get();
+ }
+
+private:
+ bool m_isInitialized = false;
+ RetainPtr<T> m_value;
+};
+
</ins><span class="cx"> @implementation WKWebViewConfiguration {
</span><del>- RetainPtr<WKProcessPool> _processPool;
- RetainPtr<WKPreferences> _preferences;
- RetainPtr<WKUserContentController> _userContentController;
- RetainPtr<_WKVisitedLinkProvider> _visitedLinkProvider;
- RetainPtr<_WKWebsiteDataStore> _websiteDataStore;
</del><ins>+ LazyInitialized<WKProcessPool> _processPool;
+ LazyInitialized<WKPreferences> _preferences;
+ LazyInitialized<WKUserContentController> _userContentController;
+ LazyInitialized<_WKVisitedLinkProvider> _visitedLinkProvider;
+ LazyInitialized<_WKWebsiteDataStore> _websiteDataStore;
</ins><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><span class="cx"> RetainPtr<NSString> _groupIdentifier;
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- RetainPtr<WKWebViewContentProviderRegistry> _contentProviderRegistry;
</del><ins>+ LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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;
-}
-
</del><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; processPool = %@; preferences = %@>", NSStringFromClass(self.class), self, _processPool.get(), _preferences.get()];
</del><ins>+ return [NSString stringWithFormat:@"<%@: %p; processPool = %@; preferences = %@>", NSStringFromClass(self.class), self, self.processPool, self.preferences];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="cx"> {
</span><span class="cx"> WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
</span><span class="cx">
</span><del>- configuration.processPool = _processPool.get();
- configuration.preferences = _preferences.get();
- configuration.userContentController = _userContentController.get();
- configuration._visitedLinkProvider = _visitedLinkProvider.get();
- configuration._websiteDataStore = _websiteDataStore.get();
</del><ins>+ configuration.processPool = self.processPool;
+ configuration.preferences = self.preferences;
+ configuration.userContentController = self.userContentController;
+ configuration._visitedLinkProvider = self._visitedLinkProvider;
+ configuration._websiteDataStore = self._websiteDataStore;
</ins><span class="cx"> configuration._relatedWebView = _relatedWebView.get().get();
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- configuration._contentProviderRegistry = _contentProviderRegistry.get();
</del><ins>+ configuration._contentProviderRegistry = self._contentProviderRegistry;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="lines">@@ -92,85 +103,85 @@
</span><span class="cx">
</span><span class="cx"> - (WKProcessPool *)processPool
</span><span class="cx"> {
</span><del>- return _processPool.get();
</del><ins>+ return _processPool.get([] { return adoptNS([[WKProcessPool alloc] init]); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setProcessPool:(WKProcessPool *)processPool
</span><span class="cx"> {
</span><del>- _processPool = processPool;
</del><ins>+ _processPool.set(processPool);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKPreferences *)preferences
</span><span class="cx"> {
</span><del>- return _preferences.get();
</del><ins>+ return _preferences.get([] { return adoptNS([[WKPreferences alloc] init]); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPreferences:(WKPreferences *)preferences
</span><span class="cx"> {
</span><del>- _preferences = preferences;
</del><ins>+ _preferences.set(preferences);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKUserContentController *)userContentController
</span><span class="cx"> {
</span><del>- return _userContentController.get();
</del><ins>+ return _userContentController.get([] { return adoptNS([[WKUserContentController alloc] init]); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setUserContentController:(WKUserContentController *)userContentController
</span><span class="cx"> {
</span><del>- _userContentController = userContentController;
</del><ins>+ _userContentController.set(userContentController);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (_WKVisitedLinkProvider *)_visitedLinkProvider
</span><span class="cx"> {
</span><del>- return _visitedLinkProvider.get();
</del><ins>+ return _visitedLinkProvider.get([] { return adoptNS([[_WKVisitedLinkProvider alloc] init]); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setVisitedLinkProvider:(_WKVisitedLinkProvider *)visitedLinkProvider
</span><span class="cx"> {
</span><del>- _visitedLinkProvider = visitedLinkProvider;
</del><ins>+ _visitedLinkProvider.set(visitedLinkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (_WKWebsiteDataStore *)_websiteDataStore
</span><span class="cx"> {
</span><del>- return _websiteDataStore.get();
</del><ins>+ return _websiteDataStore.get([] { return [_WKWebsiteDataStore defaultDataStore]; });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setWebsiteDataStore:(_WKWebsiteDataStore *)websiteDataStore
</span><span class="cx"> {
</span><del>- _websiteDataStore = websiteDataStore;
</del><ins>+ _websiteDataStore.set(websiteDataStore);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (WKWebViewContentProviderRegistry *)_contentProviderRegistry
</span><span class="cx"> {
</span><del>- return _contentProviderRegistry.get();
</del><ins>+ return _contentProviderRegistry.get([] { return adoptNS([[WKWebViewContentProviderRegistry alloc] init]); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setContentProviderRegistry:(WKWebViewContentProviderRegistry *)registry
</span><span class="cx"> {
</span><del>- _contentProviderRegistry = registry;
</del><ins>+ _contentProviderRegistry.set(registry);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (void)_validate
</span><span class="cx"> {
</span><del>- if (!_processPool)
</del><ins>+ if (!self.processPool)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration.processPool is nil"];
</span><span class="cx">
</span><del>- if (!_preferences)
</del><ins>+ if (!self.preferences)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration.preferences is nil"];
</span><span class="cx">
</span><del>- if (!_userContentController)
</del><ins>+ if (!self.userContentController)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration.userContentController is nil"];
</span><span class="cx">
</span><del>- if (!_visitedLinkProvider)
</del><ins>+ if (!self._visitedLinkProvider)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkProvider is nil"];
</span><span class="cx">
</span><del>- if (!_websiteDataStore)
</del><ins>+ if (!self._websiteDataStore)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration._websiteDataStore is nil"];
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (!_contentProviderRegistry)
</del><ins>+ if (!self._contentProviderRegistry)
</ins><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration._contentProviderRegistry is nil"];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>