<!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>[282686] 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/282686">282686</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2021-09-17 13:07:23 -0700 (Fri, 17 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference
https://bugs.webkit.org/show_bug.cgi?id=230371

Reviewed by Tim Horton.
Source/WebCore:

There were ordering problems that resulted from timing of a test calling
internals.setUsesMockScrollAnimator(true) and the first access of the scrollAnimator(),
which resulted in fast/scrolling/scroll-animator-select-list-events.html failing
when run twice in a row.

Fix by making usesMockScrollAnimator a WebPreference, which means that tests
can use <!-- webkit-test-runner --> options to enable it, which avoids the
ordering dependency.

* page/DeprecatedGlobalSettings.cpp:
(WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator): Deleted.
(WebCore::DeprecatedGlobalSettings::usesMockScrollAnimator): Deleted.
* page/DeprecatedGlobalSettings.h:
* page/FrameView.cpp:
(WebCore::FrameView::mockScrollAnimatorEnabled const):
(WebCore::FrameView::usesMockScrollAnimator const): Deleted.
* page/FrameView.h:
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::scrollAnimator const):
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::mockScrollAnimatorEnabled const):
(WebCore::ScrollableArea::usesMockScrollAnimator const): Deleted.
* rendering/RenderLayerScrollableArea.cpp:
(WebCore::RenderLayerScrollableArea::mockScrollAnimatorEnabled const):
(WebCore::RenderLayerScrollableArea::usesMockScrollAnimator const): Deleted.
* rendering/RenderLayerScrollableArea.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::mockScrollAnimatorEnabled const):
(WebCore::RenderListBox::usesMockScrollAnimator const): Deleted.
* rendering/RenderListBox.h:
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setUsesMockScrollAnimator): Deleted.
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKitLegacy/win:

Add Windows preferences.

* WebPreferences.cpp:
(WebPreferences::mockScrollAnimatorEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Source/WTF:

Add a MockScrollAnimatorEnabled setting.

* Scripts/Preferences/WebPreferences.yaml:

LayoutTests:

Convert to use the  <!-- webkit-test-runner --> format for specifying MockScrollAnimatorEnabled.

* fast/scrolling/scroll-animator-basic-events.html:
* fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html:
* fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html:
* fast/scrolling/scroll-animator-select-list-events.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollanimatorbasiceventshtml">trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollanimatoroverlayscrollbarsclickedhtml">trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollanimatoroverlayscrollbarshoveredhtml">trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollanimatorselectlisteventshtml">trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.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="#trunkSourceWebCorepageDeprecatedGlobalSettingscpp">trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDeprecatedGlobalSettingsh">trunk/Source/WebCore/page/DeprecatedGlobalSettings.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreacpp">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreah">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitLegacywinChangeLog">trunk/Source/WebKitLegacy/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacywinWebPreferencescpp">trunk/Source/WebKitLegacy/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitLegacywinWebPreferencesh">trunk/Source/WebKitLegacy/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitLegacywinWebViewcpp">trunk/Source/WebKitLegacy/win/WebView.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionscpp">trunk/Tools/DumpRenderTree/TestOptions.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/LayoutTests/ChangeLog 2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference
+        https://bugs.webkit.org/show_bug.cgi?id=230371
+
+        Reviewed by Tim Horton.
+        
+        Convert to use the  <!-- webkit-test-runner --> format for specifying MockScrollAnimatorEnabled.
+
+        * fast/scrolling/scroll-animator-basic-events.html:
+        * fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html:
+        * fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html:
+        * fast/scrolling/scroll-animator-select-list-events.html:
+
</ins><span class="cx"> 2021-09-17  Ayumi Kojima  <ayumi_kojima@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ iOS ] http/wpt/webaudio/the-audio-api/the-audioworklet-interface/context-already-rendering.html is flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollanimatorbasiceventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-basic-events.html  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html>
</del><ins>+<html> <!-- webkit-test-runner [ MockScrollAnimatorEnabled=true ] -->
</ins><span class="cx"> <style>
</span><span class="cx">     #scrollme {
</span><span class="cx">         width: 100px;
</span><span class="lines">@@ -12,8 +12,6 @@
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx">     jsTestIsAsync = true;
</span><del>-    if (window.internals)
-        window.internals.setUsesMockScrollAnimator(true);
</del><span class="cx"> 
</span><span class="cx">     window.onload = function() {
</span><span class="cx">         if (window.internals)
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollanimatoroverlayscrollbarsclickedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-clicked.html    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><del>-<html>
</del><ins>+<html> <!-- webkit-test-runner [ MockScrollAnimatorEnabled=true ] -->
</ins><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx">     jsTestIsAsync = true;
</span><span class="cx">     if (window.internals) {
</span><del>-        window.internals.setUsesMockScrollAnimator(true);
</del><span class="cx">         window.internals.setUsesOverlayScrollbars(true);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollanimatoroverlayscrollbarshoveredhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><del>-<html>
</del><ins>+<html> <!-- webkit-test-runner [ MockScrollAnimatorEnabled=true ] -->
</ins><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx">     jsTestIsAsync = true;
</span><span class="cx">     if (window.internals) {
</span><del>-        window.internals.setUsesMockScrollAnimator(true);
</del><span class="cx">         window.internals.setUsesOverlayScrollbars(true);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollanimatorselectlisteventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/LayoutTests/fast/scrolling/scroll-animator-select-list-events.html    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,9 +1,7 @@
</span><del>-<html>
</del><ins>+<html> <!-- webkit-test-runner [ MockScrollAnimatorEnabled=true ] -->
</ins><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx">     jsTestIsAsync = true;
</span><del>-    if (window.internals)
-        window.internals.setUsesMockScrollAnimator(true);
</del><span class="cx"> 
</span><span class="cx">     window.onload = function() {
</span><span class="cx">         if (window.internals)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WTF/ChangeLog  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference
+        https://bugs.webkit.org/show_bug.cgi?id=230371
+
+        Reviewed by Tim Horton.
+
+        Add a MockScrollAnimatorEnabled setting.
+
+        * Scripts/Preferences/WebPreferences.yaml:
+
</ins><span class="cx"> 2021-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][a11y] Add a build option to enable ATSPI
</span></span></pre></div>
<a id="trunkSourceWTFScriptsPreferencesWebPreferencesyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1521,6 +1521,16 @@
</span><span class="cx">     WebKit:
</span><span class="cx">       default: true
</span><span class="cx"> 
</span><ins>+MockScrollAnimatorEnabled:
+  type: bool
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
</ins><span class="cx"> MockScrollbarsEnabled:
</span><span class="cx">   type: bool
</span><span class="cx">   webcoreBinding: DeprecatedGlobalSettings
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/ChangeLog      2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2021-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference
+        https://bugs.webkit.org/show_bug.cgi?id=230371
+
+        Reviewed by Tim Horton.
+
+        There were ordering problems that resulted from timing of a test calling
+        internals.setUsesMockScrollAnimator(true) and the first access of the scrollAnimator(),
+        which resulted in fast/scrolling/scroll-animator-select-list-events.html failing
+        when run twice in a row.
+
+        Fix by making usesMockScrollAnimator a WebPreference, which means that tests
+        can use <!-- webkit-test-runner --> options to enable it, which avoids the
+        ordering dependency.
+
+        * page/DeprecatedGlobalSettings.cpp:
+        (WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator): Deleted.
+        (WebCore::DeprecatedGlobalSettings::usesMockScrollAnimator): Deleted.
+        * page/DeprecatedGlobalSettings.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::mockScrollAnimatorEnabled const):
+        (WebCore::FrameView::usesMockScrollAnimator const): Deleted.
+        * page/FrameView.h:
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::scrollAnimator const):
+        * platform/ScrollableArea.h:
+        (WebCore::ScrollableArea::mockScrollAnimatorEnabled const):
+        (WebCore::ScrollableArea::usesMockScrollAnimator const): Deleted.
+        * rendering/RenderLayerScrollableArea.cpp:
+        (WebCore::RenderLayerScrollableArea::mockScrollAnimatorEnabled const):
+        (WebCore::RenderLayerScrollableArea::usesMockScrollAnimator const): Deleted.
+        * rendering/RenderLayerScrollableArea.h:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::mockScrollAnimatorEnabled const):
+        (WebCore::RenderListBox::usesMockScrollAnimator const): Deleted.
+        * rendering/RenderListBox.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+        (WebCore::Internals::setUsesMockScrollAnimator): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
</ins><span class="cx"> 2021-09-17  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Add InlineInvalidation::horizontalConstraintChanged
</span></span></pre></div>
<a id="trunkSourceWebCorepageDeprecatedGlobalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp   2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp      2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> 
</span><span class="cx"> bool DeprecatedGlobalSettings::gMockScrollbarsEnabled = false;
</span><span class="cx"> bool DeprecatedGlobalSettings::gUsesOverlayScrollbars = false;
</span><del>-bool DeprecatedGlobalSettings::gMockScrollAnimatorEnabled = false;
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> bool DeprecatedGlobalSettings::gShouldUseHighResolutionTimers = true;
</span><span class="lines">@@ -125,16 +124,6 @@
</span><span class="cx">     return gUsesOverlayScrollbars;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DeprecatedGlobalSettings::setUsesMockScrollAnimator(bool flag)
-{
-    gMockScrollAnimatorEnabled = flag;
-}
-
-bool DeprecatedGlobalSettings::usesMockScrollAnimator()
-{
-    return gMockScrollAnimatorEnabled;
-}
-
</del><span class="cx"> void DeprecatedGlobalSettings::setLowPowerVideoAudioBufferSizeEnabled(bool flag)
</span><span class="cx"> {
</span><span class="cx">     gLowPowerVideoAudioBufferSizeEnabled = flag;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDeprecatedGlobalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.h     2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.h        2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -57,9 +57,6 @@
</span><span class="cx">     WEBCORE_EXPORT static void setUsesOverlayScrollbars(bool flag);
</span><span class="cx">     static bool usesOverlayScrollbars();
</span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT static void setUsesMockScrollAnimator(bool);
-    static bool usesMockScrollAnimator();
-
</del><span class="cx">     static bool lowPowerVideoAudioBufferSizeEnabled() { return gLowPowerVideoAudioBufferSizeEnabled; }
</span><span class="cx">     WEBCORE_EXPORT static void setLowPowerVideoAudioBufferSizeEnabled(bool);
</span><span class="cx"> 
</span><span class="lines">@@ -103,7 +100,6 @@
</span><span class="cx"> 
</span><span class="cx">     static bool gMockScrollbarsEnabled;
</span><span class="cx">     static bool gUsesOverlayScrollbars;
</span><del>-    static bool gMockScrollAnimatorEnabled;
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx">     static bool gShouldUseHighResolutionTimers;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp  2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/page/FrameView.cpp     2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1445,9 +1445,9 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool FrameView::usesMockScrollAnimator() const
</del><ins>+bool FrameView::mockScrollAnimatorEnabled() const
</ins><span class="cx"> {
</span><del>-    return DeprecatedGlobalSettings::usesMockScrollAnimator();
</del><ins>+    return frame().settings().mockScrollAnimatorEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameView::logMockScrollAnimatorMessage(const String& message) const
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h    2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/page/FrameView.h       2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     bool usesCompositedScrolling() const final;
</span><del>-    bool usesMockScrollAnimator() const final;
</del><ins>+    bool mockScrollAnimatorEnabled() const final;
</ins><span class="cx">     void logMockScrollAnimatorMessage(const String&) const final;
</span><span class="cx"> 
</span><span class="cx">     bool styleHidesScrollbarWithOrientation(ScrollbarOrientation) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> ScrollAnimator& ScrollableArea::scrollAnimator() const
</span><span class="cx"> {
</span><span class="cx">     if (!m_scrollAnimator) {
</span><del>-        if (usesMockScrollAnimator()) {
</del><ins>+        if (mockScrollAnimatorEnabled()) {
</ins><span class="cx">             m_scrollAnimator = makeUnique<ScrollAnimatorMock>(const_cast<ScrollableArea&>(*this), [this](const String& message) {
</span><span class="cx">                 logMockScrollAnimatorMessage(message);
</span><span class="cx">             });
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h   2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/platform/ScrollableArea.h      2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx">     void verticalScrollbarLayerDidChange();
</span><span class="cx">     void horizontalScrollbarLayerDidChange();
</span><span class="cx"> 
</span><del>-    virtual bool usesMockScrollAnimator() const { return false; }
</del><ins>+    virtual bool mockScrollAnimatorEnabled() const { return false; }
</ins><span class="cx">     virtual void logMockScrollAnimatorMessage(const String&) const { };
</span><span class="cx"> 
</span><span class="cx">     virtual bool shouldPlaceVerticalScrollbarOnLeft() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp     2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp        2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1832,9 +1832,9 @@
</span><span class="cx">     m_layer.updateLayerPositionsAfterScroll(&geometryMap, RenderLayer::IsOverflowScroll);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderLayerScrollableArea::usesMockScrollAnimator() const
</del><ins>+bool RenderLayerScrollableArea::mockScrollAnimatorEnabled() const
</ins><span class="cx"> {
</span><del>-    return DeprecatedGlobalSettings::usesMockScrollAnimator();
</del><ins>+    return m_layer.renderer().settings().mockScrollAnimatorEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderLayerScrollableArea::logMockScrollAnimatorMessage(const String& message) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">     bool isRubberBandInProgress() const final;
</span><span class="cx">     bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const final;
</span><span class="cx">     bool isScrollSnapInProgress() const final;
</span><del>-    bool usesMockScrollAnimator() const final;
</del><ins>+    bool mockScrollAnimatorEnabled() const final;
</ins><span class="cx">     void logMockScrollAnimatorMessage(const String&) const final;
</span><span class="cx"> 
</span><span class="cx">     String debugDescription() const final;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -898,9 +898,9 @@
</span><span class="cx">     return absoluteBoundingBoxRect();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderListBox::usesMockScrollAnimator() const
</del><ins>+bool RenderListBox::mockScrollAnimatorEnabled() const
</ins><span class="cx"> {
</span><del>-    return DeprecatedGlobalSettings::usesMockScrollAnimator();
</del><ins>+    return settings().mockScrollAnimatorEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderListBox::logMockScrollAnimatorMessage(const String& message) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h   2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/rendering/RenderListBox.h      2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">     bool isScrollableOrRubberbandable() final;
</span><span class="cx">     bool hasScrollableOrRubberbandableAncestor() final;
</span><span class="cx">     IntRect scrollableAreaBoundingBox(bool* = nullptr) const final;
</span><del>-    bool usesMockScrollAnimator() const final;
</del><ins>+    bool mockScrollAnimatorEnabled() const final;
</ins><span class="cx">     void logMockScrollAnimatorMessage(const String&) const final;
</span><span class="cx">     String debugDescription() const final;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/testing/Internals.cpp  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -531,7 +531,6 @@
</span><span class="cx">     WTF::clearDefaultPortForProtocolMapForTesting();
</span><span class="cx">     overrideUserPreferredLanguages(Vector<String>());
</span><span class="cx">     WebCore::DeprecatedGlobalSettings::setUsesOverlayScrollbars(false);
</span><del>-    WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator(false);
</del><span class="cx">     if (!page.mainFrame().editor().isContinuousSpellCheckingEnabled())
</span><span class="cx">         page.mainFrame().editor().toggleContinuousSpellChecking();
</span><span class="cx">     if (page.mainFrame().editor().isOverwriteModeEnabled())
</span><span class="lines">@@ -3820,11 +3819,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Internals::setUsesMockScrollAnimator(bool enabled)
-{
-    WebCore::DeprecatedGlobalSettings::setUsesMockScrollAnimator(enabled);
-}
-
</del><span class="cx"> void Internals::forceReload(bool endToEnd)
</span><span class="cx"> {
</span><span class="cx">     OptionSet<ReloadOption> reloadOptions;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/testing/Internals.h    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -592,7 +592,6 @@
</span><span class="cx">     JSC::JSValue evaluateInWorldIgnoringException(const String& name, const String& source);
</span><span class="cx"> 
</span><span class="cx">     void setUsesOverlayScrollbars(bool);
</span><del>-    void setUsesMockScrollAnimator(bool);
</del><span class="cx"> 
</span><span class="cx">     ExceptionOr<String> getCurrentCursorInfo();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebCore/testing/Internals.idl  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -687,7 +687,6 @@
</span><span class="cx">     any evaluateInWorldIgnoringException(DOMString name, DOMString source);
</span><span class="cx"> 
</span><span class="cx">     undefined setUsesOverlayScrollbars(boolean enabled);
</span><del>-    undefined setUsesMockScrollAnimator(boolean enabled);
</del><span class="cx"> 
</span><span class="cx">     undefined forceReload(boolean endToEnd);
</span><span class="cx">     undefined reloadExpiredOnly();
</span></span></pre></div>
<a id="trunkSourceWebKitLegacywinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/ChangeLog (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/win/ChangeLog  2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebKitLegacy/win/ChangeLog     2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference
+        https://bugs.webkit.org/show_bug.cgi?id=230371
+
+        Reviewed by Tim Horton.
+
+        Add Windows preferences.
+
+        * WebPreferences.cpp:
+        (WebPreferences::mockScrollAnimatorEnabled):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2021-09-14  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Hardening] Validate IDBValue's blob paths in WebIDBServer::putOrAdd()
</span></span></pre></div>
<a id="trunkSourceWebKitLegacywinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp    2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -2637,3 +2637,8 @@
</span><span class="cx">     return boolValueForKey("WebKitCanvasColorSpaceEnabled");
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool WebPreferences::mockScrollAnimatorEnabled()
+{
+    return boolValueForKey("WebKitMockScrollAnimatorEnabled");
+}
+
</ins></span></pre></div>
<a id="trunkSourceWebKitLegacywinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/WebPreferences.h (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/win/WebPreferences.h   2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.h      2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -346,6 +346,7 @@
</span><span class="cx">     // The following preference accessors are not exposed via IWebPreferences* as they are only
</span><span class="cx">     // needed for testing purposes and can be toggled via the set*PreferenceForTesting functions.
</span><span class="cx">     bool canvasColorSpaceEnabled();
</span><ins>+    bool mockScrollAnimatorEnabled();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     WebPreferences();
</span></span></pre></div>
<a id="trunkSourceWebKitLegacywinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/win/WebView.cpp        2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp   2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -5586,6 +5586,7 @@
</span><span class="cx">     settings.setOverscrollBehaviorEnabled(!!enabled);
</span><span class="cx"> 
</span><span class="cx">     settings.setCanvasColorSpaceEnabled(m_preferences->canvasColorSpaceEnabled());
</span><ins>+    settings.setMockScrollAnimatorEnabled(m_preferences->mockScrollAnimatorEnabled());
</ins><span class="cx"> 
</span><span class="cx">     return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (282685 => 282686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.cpp       2021-09-17 20:03:50 UTC (rev 282685)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp  2021-09-17 20:07:23 UTC (rev 282686)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx">             { "LoadsImagesAutomatically", true },
</span><span class="cx">             { "MainContentUserGestureOverrideEnabled", false },
</span><span class="cx">             { "MenuItemElementEnabled", false },
</span><ins>+            { "MockScrollAnimatorEnabled", false },
</ins><span class="cx">             { "ModernMediaControlsEnabled", true },
</span><span class="cx">             { "NeedsStorageAccessFromFileURLsQuirk", false },
</span><span class="cx">             { "OverscrollBehaviorEnabled", true },
</span></span></pre>
</div>
</div>

</body>
</html>