<!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>[166553] 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/166553">166553</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 18:02:09 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a new -[WKPreferences initWithUserDefaultsPrefixKey:] initializer
https://bugs.webkit.org/show_bug.cgi?id=130996
Reviewed by Simon Fraser.
Add a "key prefix" to the WebKit::WebPreferences create function, so we can use a different
key prefix ("WebKit") for the modern API and not pollute the user defaults namespace with
the old key prefix ("WebKit2.").
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCreate):
(WKPreferencesCreateWithIdentifier):
* UIProcess/API/Cocoa/WKPreferences.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences init]):
(-[WKPreferences initWithUserDefaultsPrefixKey:]):
(-[WKPreferences userDefaultsPrefixKey]):
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::WebPageGroup):
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::WebPreferences):
* UIProcess/WebPreferences.h:
(WebKit::WebPreferences::create):
* UIProcess/mac/WebPreferencesMac.mm:
(WebKit::makeKey):
(WebKit::setStringValueIfInUserDefaults):
(WebKit::setBoolValueIfInUserDefaults):
(WebKit::setUInt32ValueIfInUserDefaults):
(WebKit::setDoubleValueIfInUserDefaults):
(WebKit::WebPreferences::platformInitializeStore):
(WebKit::WebPreferences::platformUpdateStringValueForKey):
(WebKit::WebPreferences::platformUpdateBoolValueForKey):
(WebKit::WebPreferences::platformUpdateUInt32ValueForKey):
(WebKit::WebPreferences::platformUpdateDoubleValueForKey):
(WebKit::WebPreferences::platformUpdateFloatValueForKey):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</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="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencescpp">trunk/Source/WebKit2/UIProcess/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencesh">trunk/Source/WebKit2/UIProcess/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPreferencesMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-03-31 Anders Carlsson <andersca@apple.com>
+
+ Add a new -[WKPreferences initWithUserDefaultsPrefixKey:] initializer
+ https://bugs.webkit.org/show_bug.cgi?id=130996
+
+ Reviewed by Simon Fraser.
+
+ Add a "key prefix" to the WebKit::WebPreferences create function, so we can use a different
+ key prefix ("WebKit") for the modern API and not pollute the user defaults namespace with
+ the old key prefix ("WebKit2.").
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCreate):
+ (WKPreferencesCreateWithIdentifier):
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences init]):
+ (-[WKPreferences initWithUserDefaultsPrefixKey:]):
+ (-[WKPreferences userDefaultsPrefixKey]):
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::WebPageGroup):
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::WebPreferences):
+ * UIProcess/WebPreferences.h:
+ (WebKit::WebPreferences::create):
+ * UIProcess/mac/WebPreferencesMac.mm:
+ (WebKit::makeKey):
+ (WebKit::setStringValueIfInUserDefaults):
+ (WebKit::setBoolValueIfInUserDefaults):
+ (WebKit::setUInt32ValueIfInUserDefaults):
+ (WebKit::setDoubleValueIfInUserDefaults):
+ (WebKit::WebPreferences::platformInitializeStore):
+ (WebKit::WebPreferences::platformUpdateStringValueForKey):
+ (WebKit::WebPreferences::platformUpdateBoolValueForKey):
+ (WebKit::WebPreferences::platformUpdateUInt32ValueForKey):
+ (WebKit::WebPreferences::platformUpdateDoubleValueForKey):
+ (WebKit::WebPreferences::platformUpdateFloatValueForKey):
+
</ins><span class="cx"> 2014-03-31 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove duplicate entries in Derived Sources.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx">
</span><span class="cx"> WKPreferencesRef WKPreferencesCreate()
</span><span class="cx"> {
</span><del>- RefPtr<WebPreferences> preferences = WebPreferences::create(String());
</del><ins>+ RefPtr<WebPreferences> preferences = WebPreferences::create(String(), "WebKit2.");
</ins><span class="cx"> return toAPI(preferences.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPreferencesRef WKPreferencesCreateWithIdentifier(WKStringRef identifierRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebPreferences> preferences = WebPreferences::create(toWTFString(identifierRef));
</del><ins>+ RefPtr<WebPreferences> preferences = WebPreferences::create(toWTFString(identifierRef), "WebKit2.");
</ins><span class="cx"> return toAPI(preferences.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKPreferences : NSObject
</span><span class="cx">
</span><ins>+- (instancetype)initWithUserDefaultsPrefixKey:(NSString *)userDefaultsPrefixKey WK_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, readonly) NSString *userDefaultsPrefixKey;
+
</ins><span class="cx"> @property (nonatomic) CGFloat minimumFontSize;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -29,19 +29,34 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "WebPreferences.h"
</span><ins>+#import <wtf/RetainPtr.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WKPreferences
</span><ins>+{
+ RetainPtr<NSString> _userDefaultsPrefixKey;
+}
</ins><span class="cx">
</span><span class="cx"> - (instancetype)init
</span><span class="cx"> {
</span><ins>+ return [self initWithUserDefaultsPrefixKey:nil];
+}
+
+- (instancetype)initWithUserDefaultsPrefixKey:(NSString *)userDefaultsPrefixKey
+{
</ins><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _preferences = WebKit::WebPreferences::create(String());
</del><ins>+ _userDefaultsPrefixKey = adoptNS([userDefaultsPrefixKey copy]);
</ins><span class="cx">
</span><ins>+ _preferences = WebKit::WebPreferences::create(_userDefaultsPrefixKey.get(), "WebKit");
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)userDefaultsPrefixKey
+{
+ return _userDefaultsPrefixKey.get();
+}
+
</ins><span class="cx"> - (CGFloat)minimumFontSize
</span><span class="cx"> {
</span><span class="cx"> return _preferences->minimumFontSize();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> WebPageGroup::WebPageGroup(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
</span><span class="cx"> : m_data(pageGroupData(identifier, visibleToInjectedBundle, visibleToHistoryClient))
</span><del>- , m_preferences(WebPreferences::create(m_data.identifer))
</del><ins>+ , m_preferences(WebPreferences::create(m_data.identifer, ".WebKit2"))
</ins><span class="cx"> {
</span><span class="cx"> webPageGroupMap().set(m_data.pageGroupID, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -36,14 +36,16 @@
</span><span class="cx"> // Instead of tracking private browsing state as a boolean preference, we should let the client provide storage sessions explicitly.
</span><span class="cx"> static unsigned privateBrowsingPageCount;
</span><span class="cx">
</span><del>-WebPreferences::WebPreferences(const String& identifier)
</del><ins>+WebPreferences::WebPreferences(const String& identifier, const String& keyPrefix)
</ins><span class="cx"> : m_identifier(identifier)
</span><ins>+ , m_keyPrefix(keyPrefix)
</ins><span class="cx"> {
</span><span class="cx"> platformInitializeStore();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPreferences::WebPreferences(const WebPreferences& other)
</span><del>- : m_store(other.m_store)
</del><ins>+ : m_keyPrefix(other.m_keyPrefix)
+ , m_store(other.m_store)
</ins><span class="cx"> {
</span><span class="cx"> platformInitializeStore();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx">
</span><span class="cx"> class WebPreferences : public API::ObjectImpl<API::Object::Type::Preferences> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebPreferences> create(const String& identifier)
</del><ins>+ static PassRefPtr<WebPreferences> create(const String& identifier, const String& keyPrefix)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebPreferences(identifier));
</del><ins>+ return adoptRef(new WebPreferences(identifier, keyPrefix));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~WebPreferences();
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> static bool anyPagesAreUsingPrivateBrowsing();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebPreferences(const String&);
</del><ins>+ explicit WebPreferences(const String&, const String&);
</ins><span class="cx"> WebPreferences(const WebPreferences&);
</span><span class="cx">
</span><span class="cx"> void platformInitializeStore();
</span><span class="lines">@@ -91,7 +91,8 @@
</span><span class="cx">
</span><span class="cx"> void updatePrivateBrowsingValue(bool value);
</span><span class="cx">
</span><del>- String m_identifier;
</del><ins>+ const String m_identifier;
+ const String m_keyPrefix;
</ins><span class="cx"> WebPreferencesStore m_store;
</span><span class="cx">
</span><span class="cx"> HashSet<WebPageProxy*> m_pages;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPreferencesMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm (166552 => 166553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-04-01 00:53:29 UTC (rev 166552)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-04-01 01:02:09 UTC (rev 166553)
</span><span class="lines">@@ -31,17 +31,23 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static inline NSString* makeKey(const String& identifier, const String& baseKey)
</del><ins>+static inline NSString* makeKey(NSString *identifier, NSString *keyPrefix, NSString *key)
</ins><span class="cx"> {
</span><del>- if (!identifier)
- return nsStringFromWebCoreString(makeString("WebKit2", baseKey));
</del><ins>+ ASSERT(keyPrefix);
+ ASSERT(key);
</ins><span class="cx">
</span><del>- return nsStringFromWebCoreString(makeString(identifier, ".WebKit2", baseKey));
</del><ins>+ if (!identifier) {
+ // Allow preferences that don't have a prefix to be overridden by using the keyPrefix.
+ // For the legacy C SPI, this is “WebKit2.” and for the modern API it's “WebKit”.
+ return [keyPrefix stringByAppendingString:key];
+ }
+
+ return [NSString stringWithFormat:@"%@%@%@", identifier, keyPrefix, key];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void setStringValueIfInUserDefaults(const String& identifier, const String& key, WebPreferencesStore& store)
</del><ins>+static void setStringValueIfInUserDefaults(const String& identifier, const String& keyPrefix, const String& key, WebPreferencesStore& store)
</ins><span class="cx"> {
</span><del>- id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, key)];
</del><ins>+ id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, keyPrefix, key)];
</ins><span class="cx"> if (!object)
</span><span class="cx"> return;
</span><span class="cx"> if (![object isKindOfClass:[NSString class]])
</span><span class="lines">@@ -50,9 +56,9 @@
</span><span class="cx"> store.setStringValueForKey(key, (NSString *)object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setBoolValueIfInUserDefaults(const String& identifier, const String& key, WebPreferencesStore& store)
</del><ins>+static void setBoolValueIfInUserDefaults(const String& identifier, const String& keyPrefix, const String& key, WebPreferencesStore& store)
</ins><span class="cx"> {
</span><del>- id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, key)];
</del><ins>+ id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, keyPrefix, key)];
</ins><span class="cx"> if (!object)
</span><span class="cx"> return;
</span><span class="cx"> if (![object respondsToSelector:@selector(boolValue)])
</span><span class="lines">@@ -61,9 +67,9 @@
</span><span class="cx"> store.setBoolValueForKey(key, [object boolValue]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setUInt32ValueIfInUserDefaults(const String& identifier, const String& key, WebPreferencesStore& store)
</del><ins>+static void setUInt32ValueIfInUserDefaults(const String& identifier, const String& keyPrefix, const String& key, WebPreferencesStore& store)
</ins><span class="cx"> {
</span><del>- id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, key)];
</del><ins>+ id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, keyPrefix, key)];
</ins><span class="cx"> if (!object)
</span><span class="cx"> return;
</span><span class="cx"> if (![object respondsToSelector:@selector(intValue)])
</span><span class="lines">@@ -72,9 +78,9 @@
</span><span class="cx"> store.setUInt32ValueForKey(key, [object intValue]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setDoubleValueIfInUserDefaults(const String& identifier, const String& key, WebPreferencesStore& store)
</del><ins>+static void setDoubleValueIfInUserDefaults(const String& identifier, const String& keyPrefix, const String& key, WebPreferencesStore& store)
</ins><span class="cx"> {
</span><del>- id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, key)];
</del><ins>+ id object = [[NSUserDefaults standardUserDefaults] objectForKey:makeKey(identifier, keyPrefix, key)];
</ins><span class="cx"> if (!object)
</span><span class="cx"> return;
</span><span class="cx"> if (![object respondsToSelector:@selector(doubleValue)])
</span><span class="lines">@@ -86,7 +92,7 @@
</span><span class="cx"> void WebPreferences::platformInitializeStore()
</span><span class="cx"> {
</span><span class="cx"> #define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
</span><del>- set##TypeName##ValueIfInUserDefaults(m_identifier, WebPreferencesKey::KeyLower##Key(), m_store);
</del><ins>+ set##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
</ins><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS)
</span><span class="cx">
</span><span class="lines">@@ -98,7 +104,7 @@
</span><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[NSUserDefaults standardUserDefaults] setObject:nsStringFromWebCoreString(value) forKey:makeKey(m_identifier, key)];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setObject:nsStringFromWebCoreString(value) forKey:makeKey(m_identifier, m_keyPrefix, key)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPreferences::platformUpdateBoolValueForKey(const String& key, bool value)
</span><span class="lines">@@ -106,7 +112,7 @@
</span><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[NSUserDefaults standardUserDefaults] setBool:value forKey:makeKey(m_identifier, key)];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setBool:value forKey:makeKey(m_identifier, m_keyPrefix, key)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPreferences::platformUpdateUInt32ValueForKey(const String& key, uint32_t value)
</span><span class="lines">@@ -114,7 +120,7 @@
</span><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[NSUserDefaults standardUserDefaults] setInteger:value forKey:makeKey(m_identifier, key)];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setInteger:value forKey:makeKey(m_identifier, m_keyPrefix, key)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPreferences::platformUpdateDoubleValueForKey(const String& key, double value)
</span><span class="lines">@@ -122,7 +128,7 @@
</span><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[NSUserDefaults standardUserDefaults] setDouble:value forKey:makeKey(m_identifier, key)];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setDouble:value forKey:makeKey(m_identifier, m_keyPrefix, key)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPreferences::platformUpdateFloatValueForKey(const String& key, float value)
</span><span class="lines">@@ -130,7 +136,7 @@
</span><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[NSUserDefaults standardUserDefaults] setFloat:value forKey:makeKey(m_identifier, key)];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setFloat:value forKey:makeKey(m_identifier, m_keyPrefix, key)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>