<!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>[170253] 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/170253">170253</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-21 15:02:26 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to override debug preferences on a per-identifier basis as well as globally
https://bugs.webkit.org/show_bug.cgi?id=134164
Reviewed by Dan Bernstein.
* Shared/WebPreferencesDefinitions.h:
* Shared/WebPreferencesKeys.cpp:
* Shared/WebPreferencesKeys.h:
* Shared/WebPreferencesStore.cpp:
(WebKit::defaults):
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCreate):
(WKPreferencesCreateWithIdentifier):
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences init]):
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::WebPageGroup):
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::create):
(WebKit::WebPreferences::createWithLegacyDefaults):
(WebKit::WebPreferences::WebPreferences):
* UIProcess/WebPreferences.h:
* UIProcess/mac/WebPreferencesMac.mm:
(WebKit::makeKey):
(WebKit::debugUserDefaultsValue):
(WebKit::setDebugBoolValueIfInUserDefaults):
(WebKit::WebPreferences::platformInitializeStore):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesKeyscpp">trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesKeysh">trunk/Source/WebKit2/Shared/WebPreferencesKeys.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStorecpp">trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</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 (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Make it possible to override debug preferences on a per-identifier basis as well as globally
+ https://bugs.webkit.org/show_bug.cgi?id=134164
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * Shared/WebPreferencesKeys.cpp:
+ * Shared/WebPreferencesKeys.h:
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::defaults):
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCreate):
+ (WKPreferencesCreateWithIdentifier):
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences init]):
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::WebPageGroup):
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::create):
+ (WebKit::WebPreferences::createWithLegacyDefaults):
+ (WebKit::WebPreferences::WebPreferences):
+ * UIProcess/WebPreferences.h:
+ * UIProcess/mac/WebPreferencesMac.mm:
+ (WebKit::makeKey):
+ (WebKit::debugUserDefaultsValue):
+ (WebKit::setDebugBoolValueIfInUserDefaults):
+ (WebKit::WebPreferences::platformInitializeStore):
+
+2014-06-21 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Begin work on decoding form data
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134163
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -116,9 +116,6 @@
</span><span class="cx"> macro(ForceCompositingMode, forceCompositingMode, Bool, bool, false) \
</span><span class="cx"> macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
</span><span class="cx"> macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, DEFAULT_CANVAS_USES_ACCELERATED_DRAWING) \
</span><del>- macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
- macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
- macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \
</del><span class="cx"> macro(WebGLEnabled, webGLEnabled, Bool, bool, true) \
</span><span class="cx"> macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
</span><span class="lines">@@ -237,6 +234,11 @@
</span><span class="cx"> macro(StorageBlockingPolicy, storageBlockingPolicy, UInt32, uint32_t, WebCore::SecurityOrigin::BlockThirdPartyStorage) \
</span><span class="cx"> \
</span><span class="cx">
</span><ins>+#define FOR_EACH_WEBKIT_DEBUG_BOOL_PREFERENCE(macro) \
+ macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
+ macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
+ macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -282,6 +284,10 @@
</span><span class="cx"> macro(InspectorWindowFrame, inspectorWindowFrame, String, String, "") \
</span><span class="cx"> \
</span><span class="cx">
</span><ins>+#define FOR_EACH_WEBKIT_DEBUG_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_DEBUG_BOOL_PREFERENCE(macro) \
+ \
+
</ins><span class="cx"> #define FOR_EACH_WEBKIT_PREFERENCE(macro) \
</span><span class="cx"> FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
</span><span class="cx"> FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> return key; \
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FOR_EACH_WEBKIT_PREFERENCE(DEFINE_KEY_GETTERS)
</del><ins>+FOR_EACH_WEBKIT_PREFERENCE(DEFINE_KEY_GETTERS)
+FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DEFINE_KEY_GETTERS)
</ins><span class="cx">
</span><span class="cx"> #undef DEFINE_KEY_GETTERS
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesKeys.h (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesKeys.h 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/Shared/WebPreferencesKeys.h 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #define DECLARE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) const String& KeyLower##Key();
</span><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(DECLARE_KEY_GETTERS)
</span><ins>+FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DECLARE_KEY_GETTERS)
</ins><span class="cx">
</span><span class="cx"> #undef DECLARE_KEY_GETTERS
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -163,6 +163,7 @@
</span><span class="cx"> if (defaults.get().isEmpty()) {
</span><span class="cx"> #define DEFINE_DEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) defaults.get().set(WebPreferencesKey::KeyLower##Key(), WebPreferencesStore::Value((Type)DefaultValue));
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(DEFINE_DEFAULTS)
</span><ins>+ FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DEFINE_DEFAULTS)
</ins><span class="cx"> #undef DEFINE_DEFAULTS
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-06-21 22:02:26 UTC (rev 170253)
</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::createWithLegacyDefaults(String(), "WebKit2.");
</del><ins>+ RefPtr<WebPreferences> preferences = WebPreferences::createWithLegacyDefaults(String(), "WebKit2.", "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::createWithLegacyDefaults(toWTFString(identifierRef), "WebKit2.");
</del><ins>+ RefPtr<WebPreferences> preferences = WebPreferences::createWithLegacyDefaults(toWTFString(identifierRef), "WebKit2.", "WebKit2.");
</ins><span class="cx"> return toAPI(preferences.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _preferences = WebKit::WebPreferences::create(String(), "WebKit");
</del><ins>+ _preferences = WebKit::WebPreferences::create(String(), "WebKit", "WebKit");
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -82,9 +82,11 @@
</span><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Why does the WebPreferences object here use ".WebKit2" instead of "WebKit2." which all the other constructors use.
+// If it turns out that it's wrong, we can change it to to "WebKit2." and get rid of the globalDebugKeyPrefix from WebPreferences.
</ins><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::createWithLegacyDefaults(m_data.identifer, ".WebKit2"))
</del><ins>+ , m_preferences(WebPreferences::createWithLegacyDefaults(m_data.identifer, ".WebKit2", "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 (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -37,14 +37,14 @@
</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>-PassRefPtr<WebPreferences> WebPreferences::create(const String& identifier, const String& keyPrefix)
</del><ins>+PassRefPtr<WebPreferences> WebPreferences::create(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebPreferences(identifier, keyPrefix));
</del><ins>+ return adoptRef(new WebPreferences(identifier, keyPrefix, globalDebugKeyPrefix));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPreferences> WebPreferences::createWithLegacyDefaults(const String& identifier, const String& keyPrefix)
</del><ins>+PassRefPtr<WebPreferences> WebPreferences::createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</ins><span class="cx"> {
</span><del>- RefPtr<WebPreferences> preferences = adoptRef(new WebPreferences(identifier, keyPrefix));
</del><ins>+ RefPtr<WebPreferences> preferences = adoptRef(new WebPreferences(identifier, keyPrefix, globalDebugKeyPrefix));
</ins><span class="cx"> preferences->m_store.setOverrideDefaultsBoolValueForKey(WebPreferencesKey::javaEnabledKey(), true);
</span><span class="cx"> preferences->m_store.setOverrideDefaultsBoolValueForKey(WebPreferencesKey::javaEnabledForLocalFilesKey(), true);
</span><span class="cx"> preferences->m_store.setOverrideDefaultsBoolValueForKey(WebPreferencesKey::pluginsEnabledKey(), true);
</span><span class="lines">@@ -52,15 +52,17 @@
</span><span class="cx"> return preferences.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebPreferences::WebPreferences(const String& identifier, const String& keyPrefix)
</del><ins>+WebPreferences::WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</ins><span class="cx"> : m_identifier(identifier)
</span><span class="cx"> , m_keyPrefix(keyPrefix)
</span><ins>+ , m_globalDebugKeyPrefix(globalDebugKeyPrefix)
</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><span class="cx"> : m_keyPrefix(other.m_keyPrefix)
</span><ins>+ , m_globalDebugKeyPrefix(other.m_globalDebugKeyPrefix)
</ins><span class="cx"> , m_store(other.m_store)
</span><span class="cx"> {
</span><span class="cx"> platformInitializeStore();
</span><span class="lines">@@ -181,6 +183,7 @@
</span><span class="cx"> } \
</span><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(DEFINE_PREFERENCE_GETTER_AND_SETTERS)
</span><ins>+FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DEFINE_PREFERENCE_GETTER_AND_SETTERS)
</ins><span class="cx">
</span><span class="cx"> #undef DEFINE_PREFERENCE_GETTER_AND_SETTERS
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -44,8 +44,8 @@
</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, const String& keyPrefix);
- static PassRefPtr<WebPreferences> createWithLegacyDefaults(const String& identifier, const String& keyPrefix);
</del><ins>+ static PassRefPtr<WebPreferences> create(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
+ static PassRefPtr<WebPreferences> createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</ins><span class="cx">
</span><span class="cx"> virtual ~WebPreferences();
</span><span class="cx">
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> Type KeyLower() const; \
</span><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_PREFERENCE(DECLARE_PREFERENCE_GETTER_AND_SETTERS)
</span><ins>+ FOR_EACH_WEBKIT_DEBUG_PREFERENCE(DECLARE_PREFERENCE_GETTER_AND_SETTERS)
</ins><span class="cx">
</span><span class="cx"> #undef DECLARE_PREFERENCE_GETTER_AND_SETTERS
</span><span class="cx">
</span><span class="lines">@@ -70,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&, const String&);
</del><ins>+ explicit WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</ins><span class="cx"> WebPreferences(const WebPreferences&);
</span><span class="cx">
</span><span class="cx"> void platformInitializeStore();
</span><span class="lines">@@ -92,6 +93,7 @@
</span><span class="cx">
</span><span class="cx"> const String m_identifier;
</span><span class="cx"> const String m_keyPrefix;
</span><ins>+ const String m_globalDebugKeyPrefix;
</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 (170252 => 170253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-06-21 21:01:26 UTC (rev 170252)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-06-21 22:02:26 UTC (rev 170253)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> static inline NSString* makeKey(NSString *identifier, NSString *keyPrefix, NSString *key)
</span><span class="cx"> {
</span><del>- ASSERT(identifier);
</del><ins>+ ASSERT(identifier.length);
</ins><span class="cx"> ASSERT(keyPrefix);
</span><span class="cx"> ASSERT(key);
</span><span class="cx">
</span><span class="lines">@@ -85,8 +85,46 @@
</span><span class="cx"> store.setDoubleValueForKey(key, [object doubleValue]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+static id debugUserDefaultsValue(NSString *identifier, NSString *keyPrefix, NSString *globalDebugKeyPrefix, NSString *key)
+{
+ ASSERT(keyPrefix);
+ ASSERT(key);
+
+ NSUserDefaults *standardUserDefaults = [NSUserDefaults standardUserDefaults];
+ id object = nil;
+
+ if (identifier.length)
+ object = [standardUserDefaults objectForKey:[NSString stringWithFormat:@"%@%@%@", identifier, keyPrefix, key]];
+
+ if (!object) {
+ // Allow debug preferences to be set globally, using the debug key prefix.
+ object = [standardUserDefaults objectForKey:[globalDebugKeyPrefix stringByAppendingString:key]];
+ }
+
+ return object;
+}
+
+static void setDebugBoolValueIfInUserDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix, const String& key, WebPreferencesStore& store)
+{
+ id object = debugUserDefaultsValue(identifier, keyPrefix, globalDebugKeyPrefix, key);
+ if (!object)
+ return;
+ if (![object respondsToSelector:@selector(boolValue)])
+ return;
+
+ store.setBoolValueForKey(key, [object boolValue]);
+}
+
</ins><span class="cx"> void WebPreferences::platformInitializeStore()
</span><span class="cx"> {
</span><ins>+#define INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
+ setDebug##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, m_globalDebugKeyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
+
+ FOR_EACH_WEBKIT_DEBUG_PREFERENCE(INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS)
+
+#undef INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS
+
</ins><span class="cx"> if (!m_identifier)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>