<!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>[287372] trunk/Source</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/287372">287372</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-22 14:32:22 -0800 (Wed, 22 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/287364">r287364</a>.
https://bugs.webkit.org/show_bug.cgi?id=234620

broke 3 API tests

Reverted changeset:

"Preferences that read from NSUserDefaults need to be
initialied from platformInitializeStore()"
https://bugs.webkit.org/show_bug.cgi?id=234488
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/287364">r287364</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFScriptsPreferencesWebPreferencesyaml">trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebPreferencesCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebPreferencesCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPreferencescpp">trunk/Source/WebKit/UIProcess/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPreferencesh">trunk/Source/WebKit/UIProcess/WebPreferences.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WTF/ChangeLog  2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-12-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r287364.
+        https://bugs.webkit.org/show_bug.cgi?id=234620
+
+        broke 3 API tests
+
+        Reverted changeset:
+
+        "Preferences that read from NSUserDefaults need to be
+        initialied from platformInitializeStore()"
+        https://bugs.webkit.org/show_bug.cgi?id=234488
+        https://commits.webkit.org/r287364
+
</ins><span class="cx"> 2021-12-22  Zan Dobersek  <zdobersek@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [RISCV64] Add RISCV64 support in YARR
</span></span></pre></div>
<a id="trunkSourceWTFScriptsPreferencesWebPreferencesyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml    2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -1893,7 +1893,7 @@
</span><span class="cx">       "PLATFORM(GTK) || PLATFORM(WPE)": true
</span><span class="cx">       default: false
</span><span class="cx">     WebKit:
</span><del>-      # PLATFORM(MAC) initializes the value in initializeProcessStateDependentPreferences
</del><ins>+      "PLATFORM(MAC)": WebKit::defaultScrollAnimatorEnabled()
</ins><span class="cx">       "PLATFORM(GTK) || PLATFORM(WPE)": true
</span><span class="cx">       default: false
</span><span class="cx">     WebCore:
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WebKit/ChangeLog       2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-12-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r287364.
+        https://bugs.webkit.org/show_bug.cgi?id=234620
+
+        broke 3 API tests
+
+        Reverted changeset:
+
+        "Preferences that read from NSUserDefaults need to be
+        initialied from platformInitializeStore()"
+        https://bugs.webkit.org/show_bug.cgi?id=234488
+        https://commits.webkit.org/r287364
+
</ins><span class="cx"> 2021-12-22  Kate Cheney  <katherine_cheney@apple.com>
</span><span class="cx"> 
</span><span class="cx">         PCM tests crashing with 'unlink' errors
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebPreferencesCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPreferencesCocoa.mm (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebPreferencesCocoa.mm       2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPreferencesCocoa.mm  2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -140,27 +140,18 @@
</span><span class="cx">     store.setUInt32ValueForKey(key, [object unsignedIntegerValue]);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPreferences::initializeProcessStateDependentPreferences()
</del><ins>+void WebPreferences::platformInitializeStore()
</ins><span class="cx"> {
</span><ins>+    @autoreleasepool {
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-    // NOTE: This is set here, and does not set the default using the 'defaultValue' mechanism, because the
-    // 'defaultValue' must be the same in both the UIProcess and WebProcess, which may not be true for audio
-    // and video capture state as the WebProcess is not entitled to use the camera or microphone by default.
-    // If other preferences need to dynamically set the initial value based on host app state, we should extended
-    // the declarative format rather than adding more special cases here.
-    m_store.setBoolValueForKey(WebPreferencesKey::mediaDevicesEnabledKey(), UserMediaPermissionRequestManagerProxy::permittedToCaptureAudio() || UserMediaPermissionRequestManagerProxy::permittedToCaptureVideo());
</del><ins>+        // NOTE: This is set here, and does not setting the default using the 'defaultValue' mechanism, because the
+        // 'defaultValue' must be the same in both the UIProcess and WebProcess, which may not be true for audio
+        // and video capture state as the WebProcess is not entitled to use the camera or microphone by default.
+        // If other preferences need to dynamically set the initial value based on host app state, we should extended
+        // the declarative format rather than adding more special cases here.
+        m_store.setBoolValueForKey(WebPreferencesKey::mediaDevicesEnabledKey(), UserMediaPermissionRequestManagerProxy::permittedToCaptureAudio() || UserMediaPermissionRequestManagerProxy::permittedToCaptureVideo());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
-    m_store.setBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey(), [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"]);
-#endif
-}
-
-void WebPreferences::platformInitializeStore()
-{
-    @autoreleasepool {
-        initializeProcessStateDependentPreferences();
-
</del><span class="cx"> #define INITIALIZE_DEBUG_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
</span><span class="cx">         setDebug##TypeName##ValueIfInUserDefaults(m_identifier, m_keyPrefix, m_globalDebugKeyPrefix, WebPreferencesKey::KeyLower##Key(), m_store);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPreferences.cpp (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPreferences.cpp 2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WebKit/UIProcess/WebPreferences.cpp    2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-void WebPreferences::initializeProcessStateDependentPreferences()
-{
-}
-
</del><span class="cx"> void WebPreferences::platformUpdateStringValueForKey(const String&, const String&)
</span><span class="cx"> {
</span><span class="cx">     notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPreferences.h (287371 => 287372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPreferences.h   2021-12-22 22:23:51 UTC (rev 287371)
+++ trunk/Source/WebKit/UIProcess/WebPreferences.h      2021-12-22 22:32:22 UTC (rev 287372)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     void platformInitializeStore();
</span><del>-    void initializeProcessStateDependentPreferences();
</del><span class="cx"> 
</span><span class="cx">     void update();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>