<!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>[287228] trunk</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/287228">287228</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2021-12-18 12:11:35 -0800 (Sat, 18 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
https://bugs.webkit.org/show_bug.cgi?id=234456

Reviewed by Tim Horton.

Source/WebCore:

It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
which reads from NSUserDefaults, always trumps the Setting.

Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code
that sets @"NSScrollAnimationEnabled" to @NO.

Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
try to change the Setting will fail.

* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::singleAxisScroll):
(WebCore::ScrollAnimator::scrollAnimationEnabled const):
* platform/ScrollAnimator.h:
(WebCore::ScrollAnimator::platformAllowsScrollAnimation const): Deleted.
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::platformAllowsScrollAnimation const): Deleted.

Source/WebKit:

It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
which reads from NSUserDefaults, always trumps the Setting.

Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code
that sets @"NSScrollAnimationEnabled" to @NO.

Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
try to change the Setting will fail.

* Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
(WebKit::defaultScrollAnimatorEnabled):
* Shared/WebPreferencesDefaultValues.h:

Source/WebKitLegacy/mac:

It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
which reads from NSUserDefaults, always trumps the Setting.

Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
check. This allows for a WebKitTestRunner test override the setting.

Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
try to change the Setting will fail.

* WebView/WebPreferencesDefaultValues.h:
* WebView/WebPreferencesDefaultValues.mm:
(WebKit::defaultScrollAnimatorEnabled):

Source/WTF:

It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
which reads from NSUserDefaults, always trumps the Setting.

Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code
that sets @"NSScrollAnimationEnabled" to @NO.

Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
try to change the Setting will fail.

* Scripts/Preferences/WebPreferences.yaml:

Tools:

It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
which reads from NSUserDefaults, always trumps the Setting.

Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
check. This allows for a WebKitTestRunner test override the setting.

Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
try to change the Setting will fail.

* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):
* WebKitTestRunner/mac/main.mm:
(setDefaultsToConsistentValuesForTesting):

LayoutTests:

Now that ScrollAnimatorEnabled is true by default, turn it off for these tests.

* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomhorizontalscrollbarinrtlhtml">trunk/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintfixedmoveafterkeyboardscrollhtml">trunk/LayoutTests/fast/repaint/fixed-move-after-keyboard-scroll.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingarrowkeyscrollinrtldocumenthtml">trunk/LayoutTests/fast/scrolling/arrow-key-scroll-in-rtl-document.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframehorizontalwithkeyboardscaledhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframehorizontalwithkeyboardhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframeverticalwithkeyboardscaledhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframeverticalwithkeyboardhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapproximitymainframehorizontalwithkeyboardhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapproximitymainframeverticalwithkeyboardhtml">trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html</a></li>
<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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaWebPreferencesDefaultValuesCocoamm">trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitSharedWebPreferencesDefaultValuesh">trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesh">trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesmm">trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacInjectedBundleMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacmainmm">trunk/Tools/WebKitTestRunner/mac/main.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/ChangeLog 2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2021-12-17  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        Now that ScrollAnimatorEnabled is true by default, turn it off for these tests.
+
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html:
+
+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Rename MockScrollAnimatorEnabled to MockScrollbarsControllerEnabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234452
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomhorizontalscrollbarinrtlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html      2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/fast/dom/horizontal-scrollbar-in-rtl.html 2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> 
</span><span class="cx">             onload = function()
</span><span class="cx">             {
</span><ins>+                if (window.internals)
+                    internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">                 if (window.testRunner)
</span><span class="cx">                     testRunner.dumpAsText();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintfixedmoveafterkeyboardscrollhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/fixed-move-after-keyboard-scroll.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/fixed-move-after-keyboard-scroll.html     2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/fast/repaint/fixed-move-after-keyboard-scroll.html        2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx">   <script>
</span><span class="cx">       function runTest()
</span><span class="cx">       {
</span><ins>+          if (window.internals)
+              internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">           frames[0].focus();
</span><span class="cx">           if (window.eventSender) {
</span><span class="cx">               window.eventSender.keyDown("pageDown");
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingarrowkeyscrollinrtldocumenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/arrow-key-scroll-in-rtl-document.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/arrow-key-scroll-in-rtl-document.html   2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/fast/scrolling/arrow-key-scroll-in-rtl-document.html      2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -23,6 +23,9 @@
</span><span class="cx">             testRunner.waitUntilDone();
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        if (window.internals)
+            internals.settings.setScrollAnimatorEnabled(false);
+
</ins><span class="cx">         function checkForScroll()
</span><span class="cx">         {
</span><span class="cx">             var expectedScrollLeft = -120;
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframehorizontalwithkeyboardscaledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html       2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard-scaled.html  2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframehorizontalwithkeyboardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html      2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-with-keyboard.html 2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframeverticalwithkeyboardscaledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html 2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard-scaled.html    2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapmandatorymainframeverticalwithkeyboardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html        2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-with-keyboard.html   2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapproximitymainframehorizontalwithkeyboardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html      2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-horizontal-with-keyboard.html 2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollingscrollsnapscrollsnapproximitymainframeverticalwithkeyboardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html        2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe-vertical-with-keyboard.html   2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> 
</span><span class="cx">         async function runTests()
</span><span class="cx">         {
</span><ins>+            if (window.internals)
+                internals.settings.setScrollAnimatorEnabled(false);
</ins><span class="cx">             try {
</span><span class="cx">                 await UIHelper.delayFor(0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WTF/ChangeLog  2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2021-12-17  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
+        which reads from NSUserDefaults, always trumps the Setting.
+
+        Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
+        check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code 
+        that sets @"NSScrollAnimationEnabled" to @NO.
+
+        Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
+        DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
+        try to change the Setting will fail.
+
+        * Scripts/Preferences/WebPreferences.yaml:
+
+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Rename MockScrollAnimatorEnabled to MockScrollbarsControllerEnabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234452
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFScriptsPreferencesWebPreferencesyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml    2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1889,13 +1889,14 @@
</span><span class="cx">   type: bool
</span><span class="cx">   defaultValue:
</span><span class="cx">     WebKitLegacy:
</span><del>-      "PLATFORM(MAC)": true
</del><ins>+      "PLATFORM(MAC)": WebKit::defaultScrollAnimatorEnabled()
+      "PLATFORM(GTK) || PLATFORM(WPE)": true
</ins><span class="cx">       default: false
</span><span class="cx">     WebKit:
</span><del>-      "PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE)": true
</del><ins>+      "PLATFORM(MAC)": WebKit::defaultScrollAnimatorEnabled()
+      "PLATFORM(GTK) || PLATFORM(WPE)": true
</ins><span class="cx">       default: false
</span><span class="cx">     WebCore:
</span><del>-      "PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE)": true
</del><span class="cx">       default: false
</span><span class="cx"> 
</span><span class="cx"> # FIXME: This is handled via WebView SPI rather than WebPreferences for WebKitLegacy. We should change the SPI to lookup the WebPreferences value instead.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebCore/ChangeLog      2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2021-12-17  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
+        which reads from NSUserDefaults, always trumps the Setting.
+
+        Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
+        check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code 
+        that sets @"NSScrollAnimationEnabled" to @NO.
+
+        Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
+        DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
+        try to change the Setting will fail.
+
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::singleAxisScroll):
+        (WebCore::ScrollAnimator::scrollAnimationEnabled const):
+        * platform/ScrollAnimator.h:
+        (WebCore::ScrollAnimator::platformAllowsScrollAnimation const): Deleted.
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::platformAllowsScrollAnimation const): Deleted.
+
+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Rename MockScrollAnimatorEnabled to MockScrollbarsControllerEnabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234452
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp    2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">         delta = newOffset - currentOffset;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (m_scrollableArea.scrollAnimatorEnabled() && platformAllowsScrollAnimation() && !behavior.contains(ScrollBehavior::NeverAnimate)) {
</del><ins>+    if (m_scrollableArea.scrollAnimatorEnabled() && !behavior.contains(ScrollBehavior::NeverAnimate)) {
</ins><span class="cx">         if (m_scrollController.retargetAnimatedScrollBy(delta))
</span><span class="cx">             return true;
</span><span class="cx"> 
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> #if PLATFORM(GTK) || USE(NICOSIA)
</span><span class="cx"> bool ScrollAnimator::scrollAnimationEnabled() const
</span><span class="cx"> {
</span><del>-    return m_scrollableArea.scrollAnimatorEnabled() && platformAllowsScrollAnimation();
</del><ins>+    return m_scrollableArea.scrollAnimatorEnabled();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h   2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h      2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> 
</span><span class="cx">     ScrollAnimationStatus serviceScrollAnimation(MonotonicTime);
</span><span class="cx"> 
</span><del>-protected:
-    virtual bool platformAllowsScrollAnimation() const { return true; }
-
</del><span class="cx"> private:
</span><span class="cx">     void notifyPositionChanged(const FloatSize& delta);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h    2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h       2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx">     bool shouldForwardWheelEventsToParent(const PlatformWheelEvent&) const;
</span><span class="cx">     bool handleWheelEvent(const PlatformWheelEvent&) final;
</span><span class="cx"> 
</span><del>-    bool platformAllowsScrollAnimation() const;
-
</del><span class="cx">     void handleWheelEventPhase(PlatformWheelEventPhase) final;
</span><span class="cx"> 
</span><span class="cx">     bool isRubberBandInProgress() const final;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm   2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm      2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -51,12 +51,6 @@
</span><span class="cx"> 
</span><span class="cx"> ScrollAnimatorMac::~ScrollAnimatorMac() = default;
</span><span class="cx"> 
</span><del>-bool ScrollAnimatorMac::platformAllowsScrollAnimation() const
-{
-    static bool enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"];
-    return enabled;
-}
-
</del><span class="cx"> static bool rubberBandingEnabledForSystem()
</span><span class="cx"> {
</span><span class="cx">     static bool initialized = false;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKit/ChangeLog       2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
+        which reads from NSUserDefaults, always trumps the Setting.
+
+        Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
+        check. This allows for a WebKitTestRunner test override the setting. Remove the WTR code 
+        that sets @"NSScrollAnimationEnabled" to @NO.
+
+        Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
+        DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
+        try to change the Setting will fail.
+
+        * Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
+        (WebKit::defaultScrollAnimatorEnabled):
+        * Shared/WebPreferencesDefaultValues.h:
+
</ins><span class="cx"> 2021-12-18  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Convert ProtectionSpace enums into enum classes
</span></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaWebPreferencesDefaultValuesCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm     2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm        2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -65,6 +65,13 @@
</span><span class="cx"> #endif // HAVE(SYSTEM_FEATURE_FLAGS)
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC)
+bool defaultScrollAnimatorEnabled()
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"];
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPreferencesDefaultValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h    2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><ins>+bool defaultScrollAnimatorEnabled();
</ins><span class="cx"> bool defaultPassiveWheelListenersAsDefaultOnDocument();
</span><span class="cx"> bool defaultWheelEventGesturesBecomeNonBlocking();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
+        which reads from NSUserDefaults, always trumps the Setting.
+
+        Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
+        check. This allows for a WebKitTestRunner test override the setting.
+
+        Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
+        DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
+        try to change the Setting will fail.
+
+        * WebView/WebPreferencesDefaultValues.h:
+        * WebView/WebPreferencesDefaultValues.mm:
+        (WebKit::defaultScrollAnimatorEnabled):
+
</ins><span class="cx"> 2021-12-18  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Convert ProtectionSpace enums into enum classes
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h      2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h 2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> bool defaultWindowFocusRestricted();
</span><span class="cx"> bool defaultUsePreHTML5ParserQuirks();
</span><span class="cx"> bool defaultNeedsAdobeFrameReloadingQuirk();
</span><ins>+bool defaultScrollAnimatorEnabled();
</ins><span class="cx"> bool defaultTreatsAnyTextCSSLinkAsStylesheet();
</span><span class="cx"> bool defaultNeedsFrameNameFallbackToIdQuirk();
</span><span class="cx"> bool defaultNeedsKeyboardEventDisambiguationQuirks();
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm     2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm        2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -190,6 +190,12 @@
</span><span class="cx">     return needsQuirk;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool defaultScrollAnimatorEnabled()
+{
+    static bool enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"];
+    return enabled;
+}
+
</ins><span class="cx"> bool defaultTreatsAnyTextCSSLinkAsStylesheet()
</span><span class="cx"> {
</span><span class="cx">     static bool needsQuirk = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Tools/ChangeLog       2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2021-12-17  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
+        https://bugs.webkit.org/show_bug.cgi?id=234456
+
+        Reviewed by Tim Horton.
+
+        It's impossible for a test to run with an animated keyboard scroll because platformAllowsScrollAnimation(),
+        which reads from NSUserDefaults, always trumps the Setting.
+
+        Fix by initializing the setting from NSUserDefaults and removing the platformAllowsScrollAnimation()
+        check. This allows for a WebKitTestRunner test override the setting.
+
+        Unfortunately in WebKitLegacy AppKit code consults the @"NSScrollAnimationEnabled" key, so
+        DumpRenderTree has to continue to initialize this NSUserDefault to @NO and tests that
+        try to change the Setting will fail.
+
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+        * WebKitTestRunner/mac/main.mm:
+        (setDefaultsToConsistentValuesForTesting):
+
+2021-12-17  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Rename MockScrollAnimatorEnabled to MockScrollbarsControllerEnabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234452
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacInjectedBundleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm     2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm        2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx">         @"AppleAquaColorVariant": @(BlueTintedAppearance),
</span><span class="cx">         @"AppleHighlightColor": @"0.709800 0.835300 1.000000",
</span><span class="cx">         @"AppleOtherHighlightColor": @"0.500000 0.500000 0.500000",
</span><del>-        @"NSScrollAnimationEnabled": @NO,
</del><span class="cx">         @"NSOverlayScrollersEnabled": @NO,
</span><span class="cx">         @"AppleShowScrollBars": @"Always",
</span><span class="cx">         @"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacmainmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/main.mm (287227 => 287228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/main.mm 2021-12-18 19:04:53 UTC (rev 287227)
+++ trunk/Tools/WebKitTestRunner/mac/main.mm    2021-12-18 20:11:35 UTC (rev 287228)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx">         @"AppleEnableSwipeNavigateWithScrolls": @YES,
</span><span class="cx">         @"com.apple.swipescrolldirection": @1,
</span><span class="cx">         @"com.apple.trackpad.forceClick": @1,
</span><del>-        @"NSScrollAnimationEnabled": @NO,
</del><span class="cx">         @"NSOverlayScrollersEnabled": @NO,
</span><span class="cx">         @"AppleShowScrollBars": @"Always",
</span><span class="cx">         @"WebKit2UseRemoteLayerTreeDrawingArea": @NO,
</span></span></pre>
</div>
</div>

</body>
</html>