- Revision
- 271577
- Author
- [email protected]
- Date
- 2021-01-18 02:29:00 -0800 (Mon, 18 Jan 2021)
Log Message
Remove recently added glue code: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset)
https://bugs.webkit.org/show_bug.cgi?id=220705
Reviewed by Adrian Perez de Castro.
Follow-up on patch adressing the removal of the glue code that
forwards calls from RenderLayer to RenderLayerScrollableArea (see
webkit.org/b/60305).
Covered by existing tests.
Source/WebCore:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::scrollTo const):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollToOffset): Deleted.
* rendering/RenderLayer.h:
(WebCore::RenderLayer::scrollToXOffset): Deleted.
(WebCore::RenderLayer::scrollToYOffset): Deleted.
* rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::start):
(WebCore::RenderMarquee::timerFired):
Source/WebKitLegacy/mac:
* DOM/DOMHTML.mm:
(-[DOMHTMLElement setScrollXOffset:scrollYOffset:adjustForIOSCaret:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (271576 => 271577)
--- trunk/Source/WebCore/ChangeLog 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebCore/ChangeLog 2021-01-18 10:29:00 UTC (rev 271577)
@@ -1,3 +1,27 @@
+2021-01-18 Nikolas Zimmermann <[email protected]>
+
+ Remove recently added glue code: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset)
+ https://bugs.webkit.org/show_bug.cgi?id=220705
+
+ Reviewed by Adrian Perez de Castro.
+
+ Follow-up on patch adressing the removal of the glue code that
+ forwards calls from RenderLayer to RenderLayerScrollableArea (see
+ webkit.org/b/60305).
+
+ Covered by existing tests.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::scrollTo const):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollToOffset): Deleted.
+ * rendering/RenderLayer.h:
+ (WebCore::RenderLayer::scrollToXOffset): Deleted.
+ (WebCore::RenderLayer::scrollToYOffset): Deleted.
+ * rendering/RenderMarquee.cpp:
+ (WebCore::RenderMarquee::start):
+ (WebCore::RenderMarquee::timerFired):
+
2021-01-18 Miguel Gomez <[email protected]>
[WPE][GTK] Mark that the AminatedBackingStoreClient has changed only when layer requires it
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (271576 => 271577)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2021-01-18 10:29:00 UTC (rev 271577)
@@ -3920,7 +3920,7 @@
return;
// FIXME: is point a ScrollOffset or ScrollPosition? Test in RTL overflow.
- box.layer()->scrollToOffset(point);
+ box.layer()->ensureLayerScrollableArea()->scrollToOffset(point);
}
#if ENABLE(MATHML)
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (271576 => 271577)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-01-18 10:29:00 UTC (rev 271577)
@@ -396,11 +396,6 @@
return { 0, 0 };
}
-void RenderLayer::scrollToOffset(const ScrollOffset& scrollOffset, const ScrollPositionChangeOptions& options)
-{
- ensureLayerScrollableArea()->scrollToOffset(scrollOffset, options);
-}
-
void RenderLayer::scrollToXPosition(int x, const ScrollPositionChangeOptions& options)
{
ensureLayerScrollableArea()->scrollToXPosition(x, options);
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (271576 => 271577)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2021-01-18 10:29:00 UTC (rev 271577)
@@ -163,7 +163,6 @@
ScrollType currentScrollType() const;
WEBCORE_EXPORT ScrollAnimator& scrollAnimator() const;
WEBCORE_EXPORT ScrollOffset scrollOffset() const;
- WEBCORE_EXPORT void scrollToOffset(const ScrollOffset&, const ScrollPositionChangeOptions& = ScrollPositionChangeOptions::createProgrammatic());
void scrollToXPosition(int x, const ScrollPositionChangeOptions&);
void scrollToYPosition(int y, const ScrollPositionChangeOptions&);
void setScrollPosition(const ScrollPosition&, const ScrollPositionChangeOptions&);
@@ -202,8 +201,6 @@
int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
int horizontalScrollbarHeight(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1);
- void scrollToXOffset(int x) { scrollToOffset(ScrollOffset(x, scrollOffset().y()), ScrollPositionChangeOptions::createProgrammaticUnclamped()); }
- void scrollToYOffset(int y) { scrollToOffset(ScrollOffset(scrollOffset().x(), y), ScrollPositionChangeOptions::createProgrammaticUnclamped()); }
void setConstrainsScrollingToContentEdge(bool);
// End of temporary glue code
Modified: trunk/Source/WebCore/rendering/RenderMarquee.cpp (271576 => 271577)
--- trunk/Source/WebCore/rendering/RenderMarquee.cpp 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebCore/rendering/RenderMarquee.cpp 2021-01-18 10:29:00 UTC (rev 271577)
@@ -50,6 +50,7 @@
#include "HTMLMarqueeElement.h"
#include "HTMLNames.h"
#include "RenderLayer.h"
+#include "RenderLayerScrollableArea.h"
#include "RenderView.h"
namespace WebCore {
@@ -171,12 +172,15 @@
if (m_timer.isActive() || m_layer->renderer().style().marqueeIncrement().isZero())
return;
+ auto* scrollableLayer = m_layer->scrollableArea();
+ ASSERT(scrollableLayer);
+
auto details = ScrollPositionChangeOptions::createProgrammaticUnclamped();
if (!m_suspended && !m_stopped) {
if (isHorizontal())
- m_layer->scrollToOffset(ScrollOffset(m_start, 0), details);
+ scrollableLayer->scrollToOffset(ScrollOffset(m_start, 0), details);
else
- m_layer->scrollToOffset(ScrollOffset(0, m_start), details);
+ scrollableLayer->scrollToOffset(ScrollOffset(0, m_start), details);
} else {
m_suspended = false;
m_stopped = false;
@@ -244,13 +248,16 @@
{
if (m_layer->renderer().view().needsLayout())
return;
-
+
+ auto* scrollableLayer = m_layer->scrollableArea();
+ ASSERT(scrollableLayer);
+
if (m_reset) {
m_reset = false;
if (isHorizontal())
- m_layer->scrollToXOffset(m_start);
+ scrollableLayer->scrollToXOffset(m_start);
else
- m_layer->scrollToYOffset(m_start);
+ scrollableLayer->scrollToYOffset(m_start);
return;
}
@@ -290,9 +297,9 @@
}
if (isHorizontal())
- m_layer->scrollToXOffset(newPos);
+ scrollableLayer->scrollToXOffset(newPos);
else
- m_layer->scrollToYOffset(newPos);
+ scrollableLayer->scrollToYOffset(newPos);
}
} // namespace WebCore
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (271576 => 271577)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-01-18 10:29:00 UTC (rev 271577)
@@ -1,3 +1,19 @@
+2021-01-18 Nikolas Zimmermann <[email protected]>
+
+ Remove recently added glue code: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset)
+ https://bugs.webkit.org/show_bug.cgi?id=220705
+
+ Reviewed by Adrian Perez de Castro.
+
+ Follow-up on patch adressing the removal of the glue code that
+ forwards calls from RenderLayer to RenderLayerScrollableArea (see
+ webkit.org/b/60305).
+
+ Covered by existing tests.
+
+ * DOM/DOMHTML.mm:
+ (-[DOMHTMLElement setScrollXOffset:scrollYOffset:adjustForIOSCaret:]):
+
2021-01-14 Geoffrey Garen <[email protected]>
Removed most uses of dispatch_async(dispatch_get_main_queue(), ...)
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm (271576 => 271577)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm 2021-01-18 10:24:25 UTC (rev 271576)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm 2021-01-18 10:29:00 UTC (rev 271577)
@@ -53,6 +53,7 @@
#import <WebCore/HTMLTextFormControlElement.h>
#import <WebCore/JSExecState.h>
#import <WebCore/RenderLayer.h>
+#import <WebCore/RenderLayerScrollableArea.h>
#import <WebCore/WAKWindow.h>
#import <WebCore/WebCoreThreadMessage.h>
#endif
@@ -111,12 +112,16 @@
return;
auto* layer = downcast<WebCore::RenderBox>(*renderer).layer();
+ ASSERT(layer);
+
+ auto* scrollableLayer = layer->ensureLayerScrollableArea();
+
if (adjustForIOSCaret)
layer->setAdjustForIOSCaretWhenScrolling(true);
auto scrollPositionChangeOptions = WebCore::ScrollPositionChangeOptions::createProgrammatic();
scrollPositionChangeOptions.clamping = WebCore::ScrollClamping::Unclamped;
- layer->scrollToOffset(WebCore::ScrollOffset(x, y), scrollPositionChangeOptions);
+ scrollableLayer->scrollToOffset(WebCore::ScrollOffset(x, y), scrollPositionChangeOptions);
if (adjustForIOSCaret)
layer->setAdjustForIOSCaretWhenScrolling(false);
}
