Attachment 371182 Details for Bug 198476 – Patch for landing

[patch] Patch for landing

bug-198476-20190603110316.patch (text/plain), 19.77 KB, created by Zan Dobersek on 2019-06-03 02:03:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2019-06-03 02:03:17 PDT

Size: 19.77 KB

patch

obsolete

>Subversion Revision: 246028
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 196d2609c9e3d7207ffa92d1da2ea763f36a2105..b8dfde03dd577c38f9ee0d8c63eb33013459273b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2019-06-03  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [Nicosia] Disable async scrolling until implemented
>+        https://bugs.webkit.org/show_bug.cgi?id=198476
>+
>+        Reviewed by Antti Koivisto.
>+
>+        Build ScrollingCoordinator::create() method on iOS or whenever
>+        ASYNC_SCROLLING is not enabled.
>+
>+        Additionally, the USE(COORDINATED_GRAPHICS) build guards are removed
>+        throughout the async scrolling classes as they aren't required now
>+        and shouldn't be in the future.
>+
>+        * page/scrolling/ScrollingCoordinator.cpp:
>+        * page/scrolling/ScrollingStateFixedNode.cpp:
>+        * page/scrolling/ScrollingStateFixedNode.h:
>+        * page/scrolling/ScrollingStateFrameHostingNode.cpp:
>+        * page/scrolling/ScrollingStateFrameHostingNode.h:
>+        * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
>+        * page/scrolling/ScrollingStateFrameScrollingNode.h:
>+        * page/scrolling/ScrollingStateNode.cpp:
>+        * page/scrolling/ScrollingStateNode.h:
>+        * page/scrolling/ScrollingStateOverflowScrollingNode.cpp:
>+        * page/scrolling/ScrollingStateOverflowScrollingNode.h:
>+        * page/scrolling/ScrollingStatePositionedNode.cpp:
>+        * page/scrolling/ScrollingStatePositionedNode.h:
>+        * page/scrolling/ScrollingStateScrollingNode.cpp:
>+        * page/scrolling/ScrollingStateScrollingNode.h:
>+        * page/scrolling/ScrollingStateStickyNode.cpp:
>+        * page/scrolling/ScrollingStateStickyNode.h:
>+        * page/scrolling/ScrollingStateTree.cpp:
>+        * page/scrolling/ScrollingStateTree.h:
>+
> 2019-06-01  Simon Fraser  <simon.fraser@apple.com>
> 
>         [Async overflow scroll] Flashing content when scrolling async overflow with a negative z-index child
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>index 4b03db85956e4d5e9b7913462b7b0367d6948bed..235cbf2e24a22062128e78a179dee719b2706a57 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>@@ -47,7 +47,7 @@
> 
> namespace WebCore {
> 
>-#if !PLATFORM(MAC) && !USE(COORDINATED_GRAPHICS)
>+#if PLATFORM(IOS) || !ENABLE(ASYNC_SCROLLING)
> Ref<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
> {
>     return adoptRef(*new ScrollingCoordinator(page));
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>index 77cc870fd0f79913b447bb8fa5ed693a0ee92b3f..ca6439d3acf468db209c7b37239e8efc0fea9efe 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>@@ -31,7 +31,7 @@
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> namespace WebCore {
> 
>@@ -129,4 +129,4 @@ void ScrollingStateFixedNode::dumpProperties(TextStream& ts, ScrollingStateTreeA
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
>index 8e1f9f0cb3c96e3d3965d3faa015f8e1837a2800..ac3c2bf4b15a8f22c909ae67634d4e305161c6a1 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingConstraints.h"
> #include "ScrollingStateNode.h"
>@@ -68,4 +68,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFixedNode, isFixedNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp
>index ecb64d59af0718a812151f3cdf169880eabf874f..95030329ec4fccc51ee65ad572eef0768bdeda59 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateFrameHostingNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
>@@ -84,4 +84,4 @@ void ScrollingStateFrameHostingNode::dumpProperties(TextStream& ts, ScrollingSta
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h
>index 4f29545ef128ba76cb6122698df21084949ec18a..0568cd2baafdeaaebf9f9631bfd501da112e23f9 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateNode.h"
> 
>@@ -62,4 +62,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFrameHostingNode, isFrameHostingNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>index 23203f52885ce8def73b6d26d3a7768292fe6e12..46ef674c5bf5058da3da5e2bedabd2f34f1be3d1 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateFrameScrollingNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
>@@ -335,4 +335,4 @@ void ScrollingStateFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingS
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>index e0cd83b2f71f57bf39990f490fdf7a3a03dbf964..13c650f09e89d40a2fee94bb26d4b404bb5cb696 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "EventTrackingRegions.h"
> #include "ScrollTypes.h"
>@@ -164,4 +164,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFrameScrollingNode, isFrameScrollingNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateNode.cpp
>index 056c7c50da533b5798c26b9d4b3e8daa68b1b5b0..91eea44e093f77c500004d4ddc09b342c0fb4284 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateFixedNode.h"
> #include "ScrollingStateTree.h"
>@@ -205,4 +205,4 @@ String ScrollingStateNode::scrollingStateTreeAsText(ScrollingStateTreeAsTextBeha
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.h b/Source/WebCore/page/scrolling/ScrollingStateNode.h
>index ccdd5c329473459f8e96734031810fbf3e623bc6..6cb6e81398a9b1bb7489263bb6c4db78f8ec98d3 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "GraphicsLayer.h"
> #include "ScrollingCoordinator.h"
>@@ -279,4 +279,4 @@ SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
>     static bool isType(const WebCore::ScrollingStateNode& node) { return node.predicate; } \
> SPECIALIZE_TYPE_TRAITS_END()
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>index 1e7686ccc9c0be0f6c4b21b2433c8cb792bd7c17..e6aa63a0d1540715f6c4a7758a54ea84cfb74ff2 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateOverflowScrollingNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
>@@ -64,4 +64,4 @@ void ScrollingStateOverflowScrollingNode::dumpProperties(TextStream& ts, Scrolli
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
>index a394bbbeda7578fdb8778c96a4ed8af01b328f91..47e52e484547de2344ea8c19472a64602288af80 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateScrollingNode.h"
> 
>@@ -50,4 +50,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateOverflowScrollingNode, isOverflowScrollingNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp b/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp
>index e71f8017434a7bf7f164ec5a627e8d41039ae1e3..704d5056b24126561e08a928c250e4a9b2dcb2c5 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp
>@@ -31,7 +31,7 @@
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> namespace WebCore {
> 
>@@ -106,4 +106,4 @@ void ScrollingStatePositionedNode::dumpProperties(TextStream& ts, ScrollingState
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h b/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h
>index 601a966c1ca9df41f55834b711989159009fcc32..cb1beace8e25b1cc68635e530504282c12820bac 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingConstraints.h"
> #include "ScrollingStateNode.h"
>@@ -73,4 +73,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStatePositionedNode, isPositionedNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
>index d74969a421b990c49762f5bf8d5dad181ba25f3b..6acc985ff522ccb3f8afa25bb0486c56eff3076a 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateScrollingNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingStateTree.h"
> #include <wtf/text/TextStream.h>
>@@ -350,4 +350,4 @@ void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, ScrollingStateT
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
>index 1d96f2ff026eb561dd368d7447853eeb51509f60..b4581cfdb69c58df2dd9c5382c5482a90954e378 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollSnapOffsetsInfo.h"
> #include "ScrollTypes.h"
>@@ -178,4 +178,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateScrollingNode, isScrollingNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>index f1a0b9b380d7a1348b0424110123156f5092d319..94666596c4173ee2ac598fe610b609dc43fb16f1 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateStickyNode.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "GraphicsLayer.h"
> #include "Logging.h"
>@@ -139,4 +139,4 @@ void ScrollingStateStickyNode::dumpProperties(TextStream& ts, ScrollingStateTree
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
>index a5f867c0fd92e11bc158cfcd5b499a39b5c76dd0..8f075f6d2ef070b5930af3dd29677a6dbef75e60 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingConstraints.h"
> #include "ScrollingStateNode.h"
>@@ -68,4 +68,4 @@ private:
> 
> SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateStickyNode, isStickyNode())
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>index c5d70bd6ec91fa328e8f87c944fe1a7ce2da4a46..138e6daff4e2708396810a9508f7dda893cacbe3 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ScrollingStateTree.h"
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "AsyncScrollingCoordinator.h"
> #include "Logging.h"
>@@ -418,4 +418,4 @@ void showScrollingStateTree(const WebCore::ScrollingStateNode* node)
> 
> #endif
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateTree.h b/Source/WebCore/page/scrolling/ScrollingStateTree.h
>index f8776820857a4b135e11f951f093be611c18e932..24d8180f31250471371abee2ee1a1c4ec58264d1 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateTree.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateTree.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#if ENABLE(ASYNC_SCROLLING)
> 
> #include "ScrollingCoordinator.h"
> #include "ScrollingStateNode.h"
>@@ -113,4 +113,4 @@ void showScrollingStateTree(const WebCore::ScrollingStateTree*);
> void showScrollingStateTree(const WebCore::ScrollingStateNode*);
> #endif
> 
>-#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
>+#endif // ENABLE(ASYNC_SCROLLING)
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index b3935a870ace68c83414c2f09980b3f55e0f5571..633ff282f46a7de3336dd7487f442dbd338cd8ff 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -142,7 +142,7 @@ endif ()
> # without approval from a GTK+ reviewer. There must be strong reason to support
> # changing the value of the option.
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
>diff --git a/Source/cmake/OptionsPlayStation.cmake b/Source/cmake/OptionsPlayStation.cmake
>index 4028b772b5f90e4f50dc9a70cfc8da5fda3eaa82..32128f1cc29ae1b847ec0daca2dfa660c5719bc2 100644
>--- a/Source/cmake/OptionsPlayStation.cmake
>+++ b/Source/cmake/OptionsPlayStation.cmake
>@@ -12,7 +12,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DFG_JIT PRIVATE OFF)
> 
> # Enabled features
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
> 
> # Experimental features
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 1d403af8659271682d3c6ff5e09d5b7dc1c64733..5c99232ba0cd49d35dfdeb1e8bc61c4048f27abb 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -46,7 +46,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
> # Private options shared with other WebKit ports. Add options here only if
> # we need a value different from the default defined in WebKitFeatures.cmake.
> # Changing these options is completely unsupported.
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON)
>diff --git a/ChangeLog b/ChangeLog
>index 4fb464521d95111461e7b3a7d1b131a226c7a165..84c37506d46a6589e32b1f04a415d550dfd66ecf 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-03  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [Nicosia] Disable async scrolling until implemented
>+        https://bugs.webkit.org/show_bug.cgi?id=198476
>+
>+        Reviewed by Antti Koivisto.
>+
>+        Disable async scrolling on Nicosia-using ports until the underlying
>+        implementation is complete, allowing easier refactorings of the general
>+        async scrolling system.
>+
>+        * Source/cmake/OptionsGTK.cmake:
>+        * Source/cmake/OptionsPlayStation.cmake:
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2019-05-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WEBKIT_FRAMEWORK_TARGET macro

Actions: View | Formatted Diff | Diff

Attachments on bug 198476: 371177 | 371178 | 371179 | 371182