Diff
Modified: trunk/Source/WebCore/ChangeLog (284048 => 284049)
--- trunk/Source/WebCore/ChangeLog 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebCore/ChangeLog 2021-10-12 22:44:51 UTC (rev 284049)
@@ -1,3 +1,16 @@
+2021-10-12 Ryan Haddad <[email protected]>
+
+ Unreviewed, reverting r284022.
+
+ Caused tests to exit early due to an assertion failure
+
+ Reverted changeset:
+
+ "Scrolling thread animations need to commit layers on the
+ scrolling thread"
+ https://bugs.webkit.org/show_bug.cgi?id=231593
+ https://commits.webkit.org/r284022
+
2021-10-12 Myles C. Maxfield <[email protected]>
[GPU Process] Unique RenderingResourceIdentifiers Part 9: Finish migrating RemoteResourceCache to QualifiedRenderingResourceIdentifier
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (284048 => 284049)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-12 22:44:51 UTC (rev 284049)
@@ -2908,7 +2908,7 @@
938CF24226BB728C00C09240 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABCFF14FA09D5007457AE /* WebSocket.cpp */; };
938E65F109F09840008A48EC /* JSHTMLElementWrapperFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */; };
938E666209F09B87008A48EC /* JSHTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 938E666109F09B87008A48EC /* JSHTMLCanvasElement.h */; };
- 9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391A990162746CB00297330 /* ScrollingCoordinatorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391A990162746CB00297330 /* ScrollingCoordinatorMac.h */; };
9391A99D1629D70000297330 /* ScrollingTreeScrollingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391A99B1629D70000297330 /* ScrollingTreeScrollingNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
9392146918A6D791000EE688 /* TextIteratorBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392146818A6D791000EE688 /* TextIteratorBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
9392F1420AD185F400691BD4 /* RenderCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392F1410AD185F400691BD4 /* RenderCounter.h */; };
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (284048 => 284049)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2021-10-12 22:44:51 UTC (rev 284049)
@@ -132,11 +132,11 @@
WEBCORE_EXPORT void scrollBySimulatingWheelEventForTesting(ScrollingNodeID, FloatSize) final;
WEBCORE_EXPORT bool isUserScrollInProgress(ScrollingNodeID) const override;
- WEBCORE_EXPORT bool isRubberBandInProgress(ScrollingNodeID) const override;
+ bool isRubberBandInProgress(ScrollingNodeID) const override;
WEBCORE_EXPORT bool isScrollSnapInProgress(ScrollingNodeID) const override;
- WEBCORE_EXPORT void setScrollPinningBehavior(ScrollPinningBehavior) override;
+ void setScrollPinningBehavior(ScrollPinningBehavior) override;
WEBCORE_EXPORT void reconcileViewportConstrainedLayerPositions(ScrollingNodeID, const LayoutRect& viewportRect, ScrollingLayerPositionAction) override;
WEBCORE_EXPORT void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) override;
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (284048 => 284049)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2021-10-12 22:44:51 UTC (rev 284049)
@@ -31,7 +31,7 @@
namespace WebCore {
-class WEBCORE_EXPORT ScrollingCoordinatorMac : public AsyncScrollingCoordinator {
+class ScrollingCoordinatorMac : public AsyncScrollingCoordinator {
public:
explicit ScrollingCoordinatorMac(Page*);
virtual ~ScrollingCoordinatorMac();
Modified: trunk/Source/WebKit/ChangeLog (284048 => 284049)
--- trunk/Source/WebKit/ChangeLog 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/ChangeLog 2021-10-12 22:44:51 UTC (rev 284049)
@@ -1,3 +1,16 @@
+2021-10-12 Ryan Haddad <[email protected]>
+
+ Unreviewed, reverting r284022.
+
+ Caused tests to exit early due to an assertion failure
+
+ Reverted changeset:
+
+ "Scrolling thread animations need to commit layers on the
+ scrolling thread"
+ https://bugs.webkit.org/show_bug.cgi?id=231593
+ https://commits.webkit.org/r284022
+
2021-10-12 Myles C. Maxfield <[email protected]>
[GPU Process] Unique RenderingResourceIdentifiers Part 9: Finish migrating RemoteResourceCache to QualifiedRenderingResourceIdentifier
Modified: trunk/Source/WebKit/SourcesCocoa.txt (284048 => 284049)
--- trunk/Source/WebKit/SourcesCocoa.txt 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2021-10-12 22:44:51 UTC (rev 284049)
@@ -702,7 +702,6 @@
WebProcess/WebPage/mac/DisplayRefreshMonitorMac.cpp
WebProcess/WebPage/mac/PageBannerMac.mm
-WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.mm
WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
WebProcess/WebPage/mac/WebPageMac.mm
WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (284048 => 284049)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-10-12 22:44:51 UTC (rev 284049)
@@ -2890,18 +2890,13 @@
}
#if HAVE(CVDISPLAYLINK)
-void WebPageProxy::wheelEventHysteresisUpdated(PAL::HysteresisState)
+void WebPageProxy::wheelEventHysteresisUpdated(PAL::HysteresisState state)
{
- updateDisplayLinkFrequency();
-}
-
-void WebPageProxy::updateDisplayLinkFrequency()
-{
if (!m_process->hasConnection() || !m_displayID)
return;
- bool wantsFullSpeedUpdatesForWheelEvents = m_wheelEventActivityHysteresis.state() == PAL::HysteresisState::Started;
- process().processPool().setDisplayLinkForDisplayWantsFullSpeedUpdates(*m_process->connection(), *m_displayID, wantsFullSpeedUpdatesForWheelEvents || m_hasActiveAnimatedScroll);
+ bool wantsFullSpeedUpdates = state == PAL::HysteresisState::Started;
+ process().processPool().setDisplayLinkForDisplayWantsFullSpeedUpdates(*m_process->connection(), *m_displayID, wantsFullSpeedUpdates);
}
#endif
@@ -2908,7 +2903,13 @@
void WebPageProxy::updateWheelEventActivityAfterProcessSwap()
{
#if HAVE(CVDISPLAYLINK)
- updateDisplayLinkFrequency();
+ if (m_wheelEventActivityHysteresis.state() == PAL::HysteresisState::Started) {
+ if (!m_process->hasConnection() || !m_displayID)
+ return;
+
+ bool wantsFullSpeedUpdates = true;
+ process().processPool().setDisplayLinkForDisplayWantsFullSpeedUpdates(*m_process->connection(), *m_displayID, wantsFullSpeedUpdates);
+ }
#endif
}
@@ -6160,14 +6161,6 @@
#endif
}
-void WebPageProxy::setHasActiveAnimatedScrolls(bool isRunning)
-{
- m_hasActiveAnimatedScroll = isRunning;
-#if HAVE(CVDISPLAYLINK)
- updateDisplayLinkFrequency();
-#endif
-}
-
void WebPageProxy::runOpenPanel(FrameIdentifier frameID, FrameInfoData&& frameInfo, const FileChooserSettings& settings)
{
if (m_openPanelResultListener) {
@@ -7972,7 +7965,6 @@
m_isServiceWorkerPage = false;
m_userScriptsNotified = false;
- m_hasActiveAnimatedScroll = false;
m_editorState = EditorState();
m_cachedFontAttributesAtSelectionStart.reset();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (284048 => 284049)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-10-12 22:44:51 UTC (rev 284049)
@@ -715,8 +715,6 @@
void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
WebCore::FloatPoint viewScrollPosition() const;
-
- void setHasActiveAnimatedScrolls(bool isRunning);
void setDelegatesScrolling(bool delegatesScrolling) { m_delegatesScrolling = delegatesScrolling; }
bool delegatesScrolling() const { return m_delegatesScrolling; }
@@ -2376,6 +2374,10 @@
void didReleaseAllTouchPoints() { }
#endif // PLATFORM(IOS_FAMILY)
+#if ENABLE(DATA_DETECTION)
+ RetainPtr<NSArray> m_dataDetectionResults;
+#endif
+
void performDragControllerAction(DragControllerAction, WebCore::DragData&, const String& dragStorageName, SandboxExtension::Handle&&, Vector<SandboxExtension::Handle>&&);
void updateBackingStoreDiscardableState();
@@ -2389,7 +2391,6 @@
#if HAVE(CVDISPLAYLINK)
void wheelEventHysteresisUpdated(PAL::HysteresisState);
- void updateDisplayLinkFrequency();
#endif
void updateWheelEventActivityAfterProcessSwap();
@@ -2636,6 +2637,7 @@
#if PLATFORM(MAC)
bool m_useSystemAppearance { false };
+
bool m_acceptsFirstMouse { false };
#endif
@@ -2655,10 +2657,6 @@
std::unique_ptr<WebAuthenticatorCoordinatorProxy> m_credentialsMessenger;
#endif
-#if ENABLE(DATA_DETECTION)
- RetainPtr<NSArray> m_dataDetectionResults;
-#endif
-
HashSet<WebEditCommandProxy*> m_editCommandSet;
#if PLATFORM(COCOA)
@@ -2765,8 +2763,6 @@
bool m_hasUpdatedRenderingAfterDidCommitLoad { true };
- bool m_hasActiveAnimatedScroll { false };
-
WebCore::ResourceRequest m_decidePolicyForResponseRequest;
bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (284048 => 284049)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-10-12 22:44:51 UTC (rev 284049)
@@ -67,7 +67,6 @@
RunBeforeUnloadConfirmPanel(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message) -> (bool shouldClose) Synchronous
PageDidScroll(WebCore::IntPoint scrollPosition)
- SetHasActiveAnimatedScrolls(bool hasActiveAnimatedScrolls)
RunOpenPanel(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, struct WebCore::FileChooserSettings parameters)
ShowShareSheet(struct WebCore::ShareDataWithParsedURL shareData) -> (bool granted) Async
ShowContactPicker(struct WebCore::ContactsRequestData requestData) -> (std::optional<Vector<WebCore::ContactInfo>> info) Async
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (284048 => 284049)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-12 22:44:51 UTC (rev 284049)
@@ -2610,8 +2610,6 @@
0FCD094F24C79F5B000C6D39 /* RemoteScrollingUIState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingUIState.h; sourceTree = "<group>"; };
0FD2CB2526CDD7A30008B11C /* IdentifierTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdentifierTypes.h; sourceTree = "<group>"; };
0FDCD7F61D47E92A009F08BC /* LogInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogInitialization.h; sourceTree = "<group>"; };
- 0FE27FAE2714FC150003AAAE /* TiledCoreAnimationScrollingCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TiledCoreAnimationScrollingCoordinator.h; sourceTree = "<group>"; };
- 0FE27FAF2714FC150003AAAE /* TiledCoreAnimationScrollingCoordinator.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TiledCoreAnimationScrollingCoordinator.mm; sourceTree = "<group>"; };
0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; path = DerivedSources/WebKit2/RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
0FF24A2B1879E4BC003ABF0D /* RemoteCaptureSampleManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteCaptureSampleManagerMessageReceiver.cpp; path = DerivedSources/WebKit2/RemoteCaptureSampleManagerMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteLayerTreeDrawingAreaProxyMessages.h; path = DerivedSources/WebKit2/RemoteLayerTreeDrawingAreaProxyMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -11074,8 +11072,6 @@
7C6D37FA172F555F009D2847 /* PageBannerMac.mm */,
1AAF263714687C39004A1E8A /* TiledCoreAnimationDrawingArea.h */,
1AAF263614687C39004A1E8A /* TiledCoreAnimationDrawingArea.mm */,
- 0FE27FAE2714FC150003AAAE /* TiledCoreAnimationScrollingCoordinator.h */,
- 0FE27FAF2714FC150003AAAE /* TiledCoreAnimationScrollingCoordinator.mm */,
BC963D6D113DD1A500574BE2 /* WebPageMac.mm */,
29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h */,
29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm */,
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (284048 => 284049)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-10-12 22:44:51 UTC (rev 284049)
@@ -117,10 +117,6 @@
#include "RemoteGraphicsContextGLProxy.h"
#endif
-#if PLATFORM(MAC)
-#include "TiledCoreAnimationScrollingCoordinator.h"
-#endif
-
namespace WebKit {
using namespace WebCore;
using namespace HTMLNames;
@@ -1016,16 +1012,12 @@
{
ASSERT_UNUSED(page, m_page.corePage() == &page);
#if PLATFORM(COCOA)
- switch (m_page.drawingArea()->type()) {
-#if PLATFORM(MAC)
- case DrawingAreaType::TiledCoreAnimation:
- return TiledCoreAnimationScrollingCoordinator::create(&m_page);
+ if (m_page.drawingArea()->type() != DrawingAreaType::RemoteLayerTree)
+ return nullptr;
+ return RemoteScrollingCoordinator::create(&m_page);
+#else
+ return nullptr;
#endif
- case DrawingAreaType::RemoteLayerTree:
- return RemoteScrollingCoordinator::create(&m_page);
- }
-#endif
- return nullptr;
}
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (284048 => 284049)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-10-12 22:44:51 UTC (rev 284049)
@@ -2729,11 +2729,6 @@
frame->loader().history().saveScrollPositionAndViewStateToItem(frame->loader().history().currentItem());
}
-void WebPage::setHasActiveAnimatedScrolls(bool hasActiveAnimatedScrolls)
-{
- send(Messages::WebPageProxy::SetHasActiveAnimatedScrolls(hasActiveAnimatedScrolls));
-}
-
#if ENABLE(CONTEXT_MENUS)
WebContextMenu& WebPage::contextMenu()
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (284048 => 284049)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-12 22:44:51 UTC (rev 284049)
@@ -617,9 +617,7 @@
void listenForLayoutMilestones(OptionSet<WebCore::LayoutMilestone>);
void setSuppressScrollbarAnimations(bool);
-
- void setHasActiveAnimatedScrolls(bool);
-
+
void setEnableVerticalRubberBanding(bool);
void setEnableHorizontalRubberBanding(bool);
Deleted: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.h (284048 => 284049)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.h 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.h 2021-10-12 22:44:51 UTC (rev 284049)
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
-
-#include <WebCore/ScrollingCoordinatorMac.h>
-
-namespace WebKit {
-
-class WebPage;
-
-class TiledCoreAnimationScrollingCoordinator final : public WebCore::ScrollingCoordinatorMac {
-public:
- static Ref<TiledCoreAnimationScrollingCoordinator> create(WebPage* page)
- {
- return adoptRef(*new TiledCoreAnimationScrollingCoordinator(page));
- }
-
-private:
- explicit TiledCoreAnimationScrollingCoordinator(WebPage*);
- ~TiledCoreAnimationScrollingCoordinator();
-
- void pageDestroyed() final;
- void hasNodeWithAnimatedScrollChanged(bool) final;
-
- WebPage* m_page;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
Deleted: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.mm (284048 => 284049)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.mm 2021-10-12 22:42:19 UTC (rev 284048)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationScrollingCoordinator.mm 2021-10-12 22:44:51 UTC (rev 284049)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#if ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
-#import "TiledCoreAnimationScrollingCoordinator.h"
-
-#import "WebPage.h"
-
-namespace WebKit {
-
-TiledCoreAnimationScrollingCoordinator::TiledCoreAnimationScrollingCoordinator(WebPage* page)
- : ScrollingCoordinatorMac(page->corePage())
- , m_page(page)
-{
-}
-
-TiledCoreAnimationScrollingCoordinator::~TiledCoreAnimationScrollingCoordinator() = default;
-
-void TiledCoreAnimationScrollingCoordinator::pageDestroyed()
-{
- ScrollingCoordinatorMac::pageDestroyed();
- m_page = nullptr;
-}
-
-void TiledCoreAnimationScrollingCoordinator::hasNodeWithAnimatedScrollChanged(bool haveAnimatedScrollingNodes)
-{
- if (!m_page)
- return;
-
- m_page->setHasActiveAnimatedScrolls(haveAnimatedScrollingNodes);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(ASYNC_SCROLLING) && ENABLE(SCROLLING_THREAD)
