<!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>[196987] 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/196987">196987</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 12:04:36 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKPreferences should conform to NSCoding
https://bugs.webkit.org/show_bug.cgi?id=154597
Reviewed by Sam Weinig.
Source/WebKit2:
Add NSCoding implementation.
* UIProcess/API/Cocoa/WKPreferences.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences encodeWithCoder:]):
(-[WKPreferences initWithCoder:]):
Tools:
Test encoding and decoding WKPreferences.
* TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
(encodeAndDecode):
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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 (196986 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-23 Anders Carlsson <andersca@apple.com>
+
+ WKPreferences should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154597
+
+ Reviewed by Sam Weinig.
+
+ Add NSCoding implementation.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences encodeWithCoder:]):
+ (-[WKPreferences initWithCoder:]):
+
</ins><span class="cx"> 2016-02-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement downloads with NetworkSession
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (196986 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> its web view configuration.
</span><span class="cx"> */
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><del>-@interface WKPreferences : NSObject
</del><ins>+@interface WKPreferences : NSObject <NSCoding>
</ins><span class="cx">
</span><span class="cx"> /*! @abstract The minimum font size in points.
</span><span class="cx"> @discussion The default value is 0.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (196986 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -50,6 +50,38 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: We currently only encode/decode API preferences. We should consider whether we should
+// encode/decode SPI preferences as well.
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ [coder encodeDouble:self.minimumFontSize forKey:@"minimumFontSize"];
+ [coder encodeBool:self.javaScriptEnabled forKey:@"javaScriptEnabled"];
+ [coder encodeBool:self.javaScriptCanOpenWindowsAutomatically forKey:@"javaScriptCanOpenWindowsAutomatically"];
+
+#if PLATFORM(MAC)
+ [coder encodeBool:self.javaEnabled forKey:@"javaEnabled"];
+ [coder encodeBool:self.plugInsEnabled forKey:@"plugInsEnabled"];
+#endif
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [self init]))
+ return nil;
+
+ self.minimumFontSize = [coder decodeDoubleForKey:@"minimumFontSize"];
+ self.javaScriptEnabled = [coder decodeBoolForKey:@"javaScriptEnabled"];
+ self.javaScriptCanOpenWindowsAutomatically = [coder decodeBoolForKey:@"javaScriptCanOpenWindowsAutomatically"];
+
+#if PLATFORM(MAC)
+ self.javaEnabled = [coder decodeBoolForKey:@"javaEnabled"];
+ self.plugInsEnabled = [coder decodeBoolForKey:@"plugInsEnabled"];
+#endif
+
+ return self;
+}
+
</ins><span class="cx"> - (CGFloat)minimumFontSize
</span><span class="cx"> {
</span><span class="cx"> return _preferences->minimumFontSize();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196986 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Tools/ChangeLog 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-02-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKPreferences should conform to NSCoding
+ https://bugs.webkit.org/show_bug.cgi?id=154597
+
+ Reviewed by Sam Weinig.
+
+ Test encoding and decoding WKPreferences.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
+ (encodeAndDecode):
+ (TEST):
+
+2016-02-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Fix build.
</span><span class="cx">
</span><span class="cx"> * TestWebKitAPI/mac/SyntheticBackingScaleFactorWindow.m:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (196986 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> 1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
</span><span class="cx"> 1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
</span><span class="cx"> 1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
</span><ins>+ 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAD19F51C7CE20300831E47 /* Coding.mm */; };
</ins><span class="cx"> 1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
</span><span class="cx"> 1AEDE22613E5E7E700E62FE8 /* InjectedBundleControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */; };
</span><span class="cx"> 1CB9BC381A67482300FE5678 /* WeakPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9BC371A67482300FE5678 /* WeakPtr.cpp */; };
</span><span class="lines">@@ -490,6 +491,7 @@
</span><span class="cx"> 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
</span><span class="cx"> 1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
</span><ins>+ 1AAD19F51C7CE20300831E47 /* Coding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Coding.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceRepaint.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "simple-accelerated-compositing.html"; sourceTree = "<group>"; };
</span><span class="lines">@@ -953,6 +955,7 @@
</span><span class="cx"> A18AA8CC1C3FA218009B2B97 /* ContentFiltering.h */,
</span><span class="cx"> A14FC5861B8991B600D107EB /* ContentFiltering.mm */,
</span><span class="cx"> A14FC5891B89927100D107EB /* ContentFilteringPlugIn.mm */,
</span><ins>+ 1AAD19F51C7CE20300831E47 /* Coding.mm */,
</ins><span class="cx"> A1A4FE5D18DD3DB700B5EA8A /* Download.mm */,
</span><span class="cx"> 2D8104CB1BEC13E70020DA46 /* FindInPage.mm */,
</span><span class="cx"> 2D1FE0AF1AD465C1006CD9E6 /* FixedLayoutSize.mm */,
</span><span class="lines">@@ -1863,6 +1866,7 @@
</span><span class="cx"> CD89D03A1C4EDB2A00040A04 /* WebCoreNSURLSession.mm in Sources */,
</span><span class="cx"> A1C4FB6E1BACCE50003742D0 /* QuickLook.mm in Sources */,
</span><span class="cx"> 7A5623111AD5AF3E0096B920 /* MenuTypesForMouseEvents.cpp in Sources */,
</span><ins>+ 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */,
</ins><span class="cx"> 9B0786A31C58830F00D159E3 /* InjectedBundleMakeAllShadowRootsOpen.cpp in Sources */,
</span><span class="cx"> 1A4F81CC1BDFFD37004E672E /* RemoteObjectRegistry.mm in Sources */,
</span><span class="cx"> 51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaCodingmmfromrev196986trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="copfile"><h4>Copied: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (from rev 196986, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h) (0 => 196987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-02-23 20:04:36 UTC (rev 196987)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if WK_API_ENABLED
+
+#import <WebKit/WKPreferences.h>
+#import <wtf/RetainPtr.h>
+
+template<typename T>
+RetainPtr<T> encodeAndDecode(T* t)
+{
+ auto data = [NSKeyedArchiver archivedDataWithRootObject:t];
+
+ return [NSKeyedUnarchiver unarchiveObjectWithData:data];
+}
+
+TEST(Coding, WKPreferences)
+{
+ auto a = adoptNS([[WKPreferences alloc] init]);
+
+ // Change all defaults to something else.
+ [a setMinimumFontSize:10];
+ [a setJavaScriptEnabled:NO];
+#if PLATFORM(IOS)
+ [a setJavaScriptCanOpenWindowsAutomatically:YES];
+#else
+ [a setJavaScriptCanOpenWindowsAutomatically:NO];
+ [a setJavaEnabled:YES];
+ [a setPlugInsEnabled:YES];
+#endif
+
+ auto b = encodeAndDecode(a.get());
+
+ EXPECT_EQ([a minimumFontSize], [b minimumFontSize]);
+ EXPECT_EQ([a javaScriptEnabled], [b javaScriptEnabled]);
+ EXPECT_EQ([a javaScriptCanOpenWindowsAutomatically], [b javaScriptCanOpenWindowsAutomatically]);
+
+#if PLATFORM(MAC)
+ EXPECT_EQ([a javaEnabled], [b javaEnabled]);
+ EXPECT_EQ([a plugInsEnabled], [b plugInsEnabled]);
+#endif
+}
+
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>