<!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>[197004] trunk</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/197004">197004</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 16:20:01 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebView should implement NSCoding
https://bugs.webkit.org/show_bug.cgi?id=137160
Source/WebKit2:
rdar://problem/17380562
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController initWithCoder:]):
We need to call [self init] here, so that the wrapper will be initialized.
* UIProcess/API/Cocoa/WKWebView.h:
-initWithCoder: shouldn't be unavailable, it should be a designated initializer.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
Move initialization out into a common method.
(-[WKWebView initWithFrame:configuration:]):
Call -initializeWithConfiguration: here.
(-[WKWebView initWithCoder:]):
Decode everything.
(-[WKWebView encodeWithCoder:]):
Encode everything.
Tools:
Reviewed by Dan Bernstein.
Add tests.
* TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</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="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKWebView should implement NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=137160
+ rdar://problem/17380562
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController initWithCoder:]):
+ We need to call [self init] here, so that the wrapper will be initialized.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ -initWithCoder: shouldn't be unavailable, it should be a designated initializer.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ Move initialization out into a common method.
+
+ (-[WKWebView initWithFrame:configuration:]):
+ Call -initializeWithConfiguration: here.
+
+ (-[WKWebView initWithCoder:]):
+ Decode everything.
+
+ (-[WKWebView encodeWithCoder:]):
+ Encode everything.
+
+2016-02-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Fix an API test.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/APIWebsiteDataStore.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithCoder:(NSCoder *)coder
</span><span class="cx"> {
</span><del>- if (!(self = [super init]))
</del><ins>+ if (!(self = [self init]))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> return self;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> */
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
</span><span class="cx">
</span><del>-- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
</del><ins>+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;
</ins><span class="cx">
</span><span class="cx"> /*! @abstract Navigates to a requested URL.
</span><span class="cx"> @param request The request specifying the URL to which to navigate.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -338,11 +338,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
</del><ins>+- (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
</ins><span class="cx"> {
</span><del>- if (!(self = [super initWithFrame:frame]))
- return nil;
-
</del><span class="cx"> if (!configuration)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"Configuration cannot be nil"];
</span><span class="cx">
</span><span class="lines">@@ -359,7 +356,6 @@
</span><span class="cx">
</span><span class="cx"> [_configuration _validate];
</span><span class="cx">
</span><del>-
</del><span class="cx"> WebKit::WebProcessPool& processPool = *[_configuration processPool]->_processPool;
</span><span class="cx">
</span><span class="cx"> auto pageConfiguration = API::PageConfiguration::create();
</span><span class="lines">@@ -469,16 +465,52 @@
</span><span class="cx"> _page->setDiagnosticLoggingClient(std::make_unique<WebKit::DiagnosticLoggingClient>(self));
</span><span class="cx">
</span><span class="cx"> pageToViewMap().add(_page.get(), self);
</span><ins>+}
</ins><span class="cx">
</span><ins>+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
+{
+ if (!(self = [super initWithFrame:frame]))
+ return nil;
+
+ [self _initializeWithConfiguration:configuration];
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithCoder:(NSCoder *)coder
</span><span class="cx"> {
</span><del>- [self release];
- return nil;
</del><ins>+ if (!(self = [super initWithCoder:coder]))
+ return nil;
+
+ WKWebViewConfiguration *configuration = [coder decodeObjectForKey:@"configuration"];
+ [self _initializeWithConfiguration:configuration];
+
+ self.allowsBackForwardNavigationGestures = [coder decodeBoolForKey:@"allowsBackForwardNavigationGestures"];
+ self.customUserAgent = [coder decodeObjectForKey:@"customUserAgent"];
+ self.allowsLinkPreview = [coder decodeBoolForKey:@"allowsLinkPreview"];
+
+#if PLATFORM(MAC)
+ self.allowsMagnification = [coder decodeBoolForKey:@"allowsMagnification"];
+ self.magnification = [coder decodeDoubleForKey:@"magnification"];
+#endif
+
+ return self;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ [coder encodeObject:_configuration.get() forKey:@"configuration"];
+
+ [coder encodeBool:self.allowsBackForwardNavigationGestures forKey:@"allowsBackForwardNavigationGestures"];
+ [coder encodeObject:self.customUserAgent forKey:@"customUserAgent"];
+ [coder encodeBool:self.allowsLinkPreview forKey:@"allowsLinkPreview"];
+
+#if PLATFORM(MAC)
+ [coder encodeBool:self.allowsMagnification forKey:@"allowsMagnification"];
+ [coder encodeDouble:self.magnification forKey:@"magnification"];
+#endif
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Tools/ChangeLog 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKWebView should implement NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=137160
+
+ Reviewed by Dan Bernstein.
+
+ Add tests.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
+ (TEST):
+
+2016-02-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WKProcessPool should conform to NSCoding
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154608
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (197003 => 197004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 23:41:53 UTC (rev 197003)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-24 00:20:01 UTC (rev 197004)
</span><span class="lines">@@ -120,4 +120,61 @@
</span><span class="cx"> EXPECT_EQ([a allowsPictureInPictureMediaPlayback], [b allowsPictureInPictureMediaPlayback]);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+TEST(Coding, WKWebView)
+{
+ auto a = adoptNS([[WKWebView alloc] init]);
+
+ // Change all defaults to something else.
+ [a setAllowsBackForwardNavigationGestures:YES];
+ [a setCustomUserAgent:@"CustomUserAgent"];
+
+#if PLATFORM(IOS)
+ [a setAllowsLinkPreview:YES];
+#else
+ [a setAllowsLinkPreview:NO];
+ [a setAllowsMagnification:YES];
+ [a setMagnification:2];
</ins><span class="cx"> #endif
</span><ins>+
+ auto b = encodeAndDecode(a.get());
+
+ EXPECT_EQ([a allowsBackForwardNavigationGestures], [b allowsBackForwardNavigationGestures]);
+ EXPECT_TRUE([[a customUserAgent] isEqualToString:[b customUserAgent]]);
+ EXPECT_EQ([a allowsLinkPreview], [b allowsLinkPreview]);
+
+#if PLATFORM(MAC)
+ EXPECT_EQ([a allowsMagnification], [b allowsMagnification]);
+ EXPECT_EQ([a magnification], [b magnification]);
+#endif
+}
+
+TEST(Coding, WKWebView_SameConfiguration)
+{
+ // First, encode two WKWebViews sharing the same configuration.
+ RetainPtr<NSData> data;
+ {
+ auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ auto a = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
+ auto b = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
+
+ data = [NSKeyedArchiver archivedDataWithRootObject:@[a.get(), b.get()]];
+ }
+
+ // Then, decode and verify that the important configuration properties are the same.
+ NSArray *array = [NSKeyedUnarchiver unarchiveObjectWithData:data.get()];
+
+ WKWebView *aView = array[0];
+ WKWebView *bView = array[1];
+
+ WKWebViewConfiguration *a = aView.configuration;
+ WKWebViewConfiguration *b = bView.configuration;
+
+ EXPECT_EQ(a.processPool, b.processPool);
+ EXPECT_EQ(a.preferences, b.preferences);
+ EXPECT_EQ(a.userContentController, b.userContentController);
+ EXPECT_EQ(a.websiteDataStore, b.websiteDataStore);
+}
+
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>