Title: [163336] trunk/Source/WebKit2
- Revision
- 163336
- Author
- simon.fra...@apple.com
- Date
- 2014-02-03 16:00:46 -0800 (Mon, 03 Feb 2014)
Log Message
Allow WK2 to read from NSUserDefaults when it has no prefs identifier
https://bugs.webkit.org/show_bug.cgi?id=128124
Reviewed by Sam Weinig.
WebPreferences would never read from NSUserDefaults if no identifier
had been set, but this prevents us from reading useful debugging prefs.
Fix to read pref names using a "WebKit2" prefix when no identifier
is set.
* UIProcess/mac/WebPreferencesMac.mm:
(WebKit::makeKey):
(WebKit::WebPreferences::platformInitializeStore):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163335 => 163336)
--- trunk/Source/WebKit2/ChangeLog 2014-02-03 23:39:53 UTC (rev 163335)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-04 00:00:46 UTC (rev 163336)
@@ -1,3 +1,20 @@
+2014-02-03 Simon Fraser <simon.fra...@apple.com>
+
+ Allow WK2 to read from NSUserDefaults when it has no prefs identifier
+ https://bugs.webkit.org/show_bug.cgi?id=128124
+
+ Reviewed by Sam Weinig.
+
+ WebPreferences would never read from NSUserDefaults if no identifier
+ had been set, but this prevents us from reading useful debugging prefs.
+
+ Fix to read pref names using a "WebKit2" prefix when no identifier
+ is set.
+
+ * UIProcess/mac/WebPreferencesMac.mm:
+ (WebKit::makeKey):
+ (WebKit::WebPreferences::platformInitializeStore):
+
2014-02-03 Jer Noble <jer.no...@apple.com>
[WK2] Remove the VideoPluginProxyEnabled preference in WK2
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm (163335 => 163336)
--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-02-03 23:39:53 UTC (rev 163335)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-02-04 00:00:46 UTC (rev 163336)
@@ -33,6 +33,9 @@
static inline NSString* makeKey(const String& identifier, const String& baseKey)
{
+ if (!identifier)
+ return nsStringFromWebCoreString(makeString("WebKit2", baseKey));
+
return nsStringFromWebCoreString(makeString(identifier, ".WebKit2", baseKey));
}
@@ -82,9 +85,6 @@
void WebPreferences::platformInitializeStore()
{
- if (!m_identifier)
- return;
-
#define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
set##TypeName##ValueIfInUserDefaults(m_identifier, WebPreferencesKey::KeyLower##Key(), m_store);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
