<!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>[163663] 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/163663">163663</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 16:37:32 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement more of WKPreferences
https://bugs.webkit.org/show_bug.cgi?id=128411
Reviewed by Tim Horton.
Give WKPreferences an underlying WebKit::WebPreferences object, add a minimumFontSize preference
and make sure that WKWebView's initializer creates a WKPreferences object if the configuration doesn't specify one.
* UIProcess/API/Cocoa/WKPreferences.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences init]):
(-[WKPreferences minimumFontSize]):
(-[WKPreferences setMinimumFontSize:]):
* UIProcess/API/Cocoa/WKPreferencesInternal.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj:</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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-07 Anders Carlsson <andersca@apple.com>
+
+ Implement more of WKPreferences
+ https://bugs.webkit.org/show_bug.cgi?id=128411
+
+ Reviewed by Tim Horton.
+
+ Give WKPreferences an underlying WebKit::WebPreferences object, add a minimumFontSize preference
+ and make sure that WKWebView's initializer creates a WKPreferences object if the configuration doesn't specify one.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences init]):
+ (-[WKPreferences minimumFontSize]):
+ (-[WKPreferences setMinimumFontSize:]):
+ * UIProcess/API/Cocoa/WKPreferencesInternal.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/WebPageProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-02-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: Some Mozilla cursor mutation tests fail
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKPreferences : NSObject
</span><span class="cx">
</span><ins>+@property (nonatomic) int minimumFontSize;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -23,13 +23,35 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-#include "WKPreferences.h"
</del><ins>+#import "config.h"
+#import "WKPreferencesInternal.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "WebPreferences.h"
+
</ins><span class="cx"> @implementation WKPreferences
</span><span class="cx">
</span><ins>+- (instancetype)init
+{
+ if ((self = [super init]))
+ return nil;
+
+ _preferences = WebKit::WebPreferences::create(String());
+
+ return self;
+}
+
+- (int)minimumFontSize
+{
+ return _preferences->minimumFontSize();
+}
+
+- (void)setMinimumFontSize:(int)minimumFontSize
+{
+ _preferences->setMinimumFontSize(minimumFontSize);
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesInternalhfromrev163662trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (from rev 163662, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm) (0 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "WKPreferences.h"
+
+#if WK_API_ENABLED
+
+#import <wtf/RefPtr.h>
+
+namespace WebKit {
+class WebPreferences;
+}
+
+@interface WKPreferences () {
+ RefPtr<WebKit::WebPreferences> _preferences;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="cx"> #import "WKNavigationDelegate.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><ins>+#import "WKPreferencesInternal.h"
</ins><span class="cx"> #import "WKProcessClass.h"
</span><span class="cx"> #import "WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "WKWebViewConfiguration.h"
</span><span class="lines">@@ -86,6 +87,9 @@
</span><span class="cx"> if (![_configuration processClass])
</span><span class="cx"> [_configuration setProcessClass:adoptNS([[WKProcessClass alloc] init]).get()];
</span><span class="cx">
</span><ins>+ if (![_configuration preferences])
+ [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
+
</ins><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -331,7 +331,6 @@
</span><span class="cx"> , public IPC::MessageReceiver
</span><span class="cx"> , public IPC::MessageSender {
</span><span class="cx"> public:
</span><del>-
</del><span class="cx"> static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, WebPreferences&, API::Session&, uint64_t pageID);
</span><span class="cx"> virtual ~WebPageProxy();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163662 => 163663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-08 00:30:50 UTC (rev 163662)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-08 00:37:32 UTC (rev 163663)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
</span><span class="cx"> 1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
</span><span class="cx"> 1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
</span><ins>+ 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
</ins><span class="cx"> 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
</span><span class="cx"> 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1A3CC16918907EB0001E6ED8 /* WKProcessClassInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */; };
</span><span class="lines">@@ -1811,6 +1812,7 @@
</span><span class="cx"> 1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; };
</span><ins>+ 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4348,6 +4350,7 @@
</span><span class="cx"> 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */,
</span><span class="cx"> 1AFDD3161891C94700153970 /* WKPreferences.h */,
</span><span class="cx"> 1AFDD3181891CA1200153970 /* WKPreferences.mm */,
</span><ins>+ 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
</ins><span class="cx"> 1A158418189044F50017616C /* WKProcessClass.h */,
</span><span class="cx"> 1A158417189044F50017616C /* WKProcessClass.mm */,
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */,
</span><span class="lines">@@ -6864,6 +6867,7 @@
</span><span class="cx"> BC9099801256A98200083756 /* WKStringPrivate.h in Headers */,
</span><span class="cx"> 1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */,
</span><span class="cx"> 5175095A1897249700408FAC /* IDBIdentifier.h in Headers */,
</span><ins>+ 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */,
</ins><span class="cx"> BC407608124FF0270068F20A /* WKType.h in Headers */,
</span><span class="cx"> 7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */,
</span><span class="cx"> BC40760A124FF0270068F20A /* WKURL.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>