Diff
Modified: trunk/Source/WebKit2/ChangeLog (196986 => 196987)
--- 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)
@@ -1,3 +1,17 @@
+2016-02-23 Anders Carlsson <[email protected]>
+
+ 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:]):
+
2016-02-23 Alex Christensen <[email protected]>
Implement downloads with NetworkSession
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (196986 => 196987)
--- 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)
@@ -35,7 +35,7 @@
its web view configuration.
*/
WK_CLASS_AVAILABLE(10_10, 8_0)
-@interface WKPreferences : NSObject
+@interface WKPreferences : NSObject <NSCoding>
/*! @abstract The minimum font size in points.
@discussion The default value is 0.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (196986 => 196987)
--- 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)
@@ -50,6 +50,38 @@
[super dealloc];
}
+// 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._javascript_Enabled forKey:@"_javascript_Enabled"];
+ [coder encodeBool:self._javascript_CanOpenWindowsAutomatically forKey:@"_javascript_CanOpenWindowsAutomatically"];
+
+#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._javascript_Enabled = [coder decodeBoolForKey:@"_javascript_Enabled"];
+ self._javascript_CanOpenWindowsAutomatically = [coder decodeBoolForKey:@"_javascript_CanOpenWindowsAutomatically"];
+
+#if PLATFORM(MAC)
+ self.javaEnabled = [coder decodeBoolForKey:@"javaEnabled"];
+ self.plugInsEnabled = [coder decodeBoolForKey:@"plugInsEnabled"];
+#endif
+
+ return self;
+}
+
- (CGFloat)minimumFontSize
{
return _preferences->minimumFontSize();
Modified: trunk/Tools/ChangeLog (196986 => 196987)
--- trunk/Tools/ChangeLog 2016-02-23 19:41:56 UTC (rev 196986)
+++ trunk/Tools/ChangeLog 2016-02-23 20:04:36 UTC (rev 196987)
@@ -1,5 +1,18 @@
2016-02-23 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Fix build.
* TestWebKitAPI/mac/SyntheticBackingScaleFactorWindow.m:
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (196986 => 196987)
--- 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)
@@ -21,6 +21,7 @@
1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
+ 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAD19F51C7CE20300831E47 /* Coding.mm */; };
1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
1AEDE22613E5E7E700E62FE8 /* InjectedBundleControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */; };
1CB9BC381A67482300FE5678 /* WeakPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9BC371A67482300FE5678 /* WeakPtr.cpp */; };
@@ -490,6 +491,7 @@
1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
+ 1AAD19F51C7CE20300831E47 /* Coding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Coding.mm; sourceTree = "<group>"; };
1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceRepaint.cpp; sourceTree = "<group>"; };
1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "simple-accelerated-compositing.html"; sourceTree = "<group>"; };
@@ -953,6 +955,7 @@
A18AA8CC1C3FA218009B2B97 /* ContentFiltering.h */,
A14FC5861B8991B600D107EB /* ContentFiltering.mm */,
A14FC5891B89927100D107EB /* ContentFilteringPlugIn.mm */,
+ 1AAD19F51C7CE20300831E47 /* Coding.mm */,
A1A4FE5D18DD3DB700B5EA8A /* Download.mm */,
2D8104CB1BEC13E70020DA46 /* FindInPage.mm */,
2D1FE0AF1AD465C1006CD9E6 /* FixedLayoutSize.mm */,
@@ -1863,6 +1866,7 @@
CD89D03A1C4EDB2A00040A04 /* WebCoreNSURLSession.mm in Sources */,
A1C4FB6E1BACCE50003742D0 /* QuickLook.mm in Sources */,
7A5623111AD5AF3E0096B920 /* MenuTypesForMouseEvents.cpp in Sources */,
+ 1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */,
9B0786A31C58830F00D159E3 /* InjectedBundleMakeAllShadowRootsOpen.cpp in Sources */,
1A4F81CC1BDFFD37004E672E /* RemoteObjectRegistry.mm in Sources */,
51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */,
Copied: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (from rev 196986, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h) (0 => 196987)
--- 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)
@@ -0,0 +1,68 @@
+/*
+ * 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 = "" 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 _javascript_Enabled], [b _javascript_Enabled]);
+ EXPECT_EQ([a _javascript_CanOpenWindowsAutomatically], [b _javascript_CanOpenWindowsAutomatically]);
+
+#if PLATFORM(MAC)
+ EXPECT_EQ([a javaEnabled], [b javaEnabled]);
+ EXPECT_EQ([a plugInsEnabled], [b plugInsEnabled]);
+#endif
+}
+
+#endif
