Skip to content

Commit

Permalink
[scroll-anchoring] Remove stale selectAnchorElement() from header file
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=266312
rdar://119583510

Reviewed by Wenson Hsieh.

Also fix "supress" typos in scroll anchoring code.

* Source/WebCore/page/scrolling/ScrollAnchoringController.cpp:
(WebCore::ScrollAnchoringController::notifyChildHadSuppressingStyleChange):
(WebCore::ScrollAnchoringController::adjustScrollPositionForAnchoring):
* Source/WebCore/page/scrolling/ScrollAnchoringController.h:

Canonical link: https://commits.webkit.org/273094@main
  • Loading branch information
nt1m committed Jan 16, 2024
1 parent 27dbd34 commit 15c87b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Source/WebCore/page/scrolling/ScrollAnchoringController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void ScrollAnchoringController::notifyChildHadSuppressingStyleChange()
{
LOG_WITH_STREAM(ScrollAnchoring, stream << "ScrollAnchoringController::notifyChildHadSuppressingStyleChange() for scroller: " << m_owningScrollableArea);

m_shouldSupressScrollPositionUpdate = true;
m_shouldSuppressScrollPositionUpdate = true;
}

bool ScrollAnchoringController::isInScrollAnchoringAncestorChain(const RenderObject& object)
Expand Down Expand Up @@ -346,15 +346,15 @@ void ScrollAnchoringController::updateAnchorElement()
void ScrollAnchoringController::adjustScrollPositionForAnchoring()
{
auto queued = std::exchange(m_isQueuedForScrollPositionUpdate, false);
auto supressed = std::exchange(m_shouldSupressScrollPositionUpdate, false);
auto suppressed = std::exchange(m_shouldSuppressScrollPositionUpdate, false);
if (!m_anchorElement || !queued)
return;
auto* renderer = m_anchorElement->renderer();
if (!renderer || supressed) {
if (!renderer || suppressed) {
invalidateAnchorElement();
updateAnchorElement();
if (supressed)
LOG_WITH_STREAM(ScrollAnchoring, stream << "ScrollAnchoringController::updateScrollPosition() supressing scroll adjustment for frame: " << frameView() << " for scroller: " << m_owningScrollableArea);
if (suppressed)
LOG_WITH_STREAM(ScrollAnchoring, stream << "ScrollAnchoringController::updateScrollPosition() suppressing scroll adjustment for frame: " << frameView() << " for scroller: " << m_owningScrollableArea);
return;
}
SetForScope midUpdatingScrollPositionForAnchorElement(m_midUpdatingScrollPositionForAnchorElement, true);
Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/page/scrolling/ScrollAnchoringController.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class ScrollAnchoringController final : public CanMakeWeakPtr<ScrollAnchoringCon
~ScrollAnchoringController();
void invalidateAnchorElement();
void adjustScrollPositionForAnchoring();
void selectAnchorElement();
void chooseAnchorElement(Document&);
CandidateExaminationResult examineAnchorCandidate(Element&);
void updateAnchorElement();
Expand All @@ -67,7 +66,7 @@ class ScrollAnchoringController final : public CanMakeWeakPtr<ScrollAnchoringCon
FloatPoint m_lastOffsetForAnchorElement;
bool m_midUpdatingScrollPositionForAnchorElement { false };
bool m_isQueuedForScrollPositionUpdate { false };
bool m_shouldSupressScrollPositionUpdate { false };
bool m_shouldSuppressScrollPositionUpdate { false };
};

} // namespace WebCore

0 comments on commit 15c87b3

Please sign in to comment.