Unreviewed. Fixing misspellings of 'position'.
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::smartDeleteParagraphSpacers):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation):
* rendering/line/BreakingContext.h:
(WebCore::BreakingContext::handleText):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263535 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7797749..e64fbf7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2020-06-25 Megan Gardner <megan_gardner@apple.com>
+
+ Unreviewed. Fixing misspellings of 'position'.
+
+ * editing/DeleteSelectionCommand.cpp:
+ (WebCore::DeleteSelectionCommand::smartDeleteParagraphSpacers):
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation):
+ * rendering/line/BreakingContext.h:
+ (WebCore::BreakingContext::handleText):
+
2020-06-25 Daniel Bates <dabates@apple.com>
[iOS] -_requestTextInputContextsInRect cannot find empty Quip spreadsheet title
diff --git a/Source/WebCore/editing/DeleteSelectionCommand.cpp b/Source/WebCore/editing/DeleteSelectionCommand.cpp
index d5d0be6..112f97b 100644
--- a/Source/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/Source/WebCore/editing/DeleteSelectionCommand.cpp
@@ -188,12 +188,12 @@
visibleEnd = visibleEnd.next(CannotCrossEditingBoundary);
bool previousPositionIsStartOfContent = startOfEditableContent(visibleStart) == visibleStart;
bool previousPositionIsBlankParagraph = isBlankParagraph(visibleStart);
- bool endPositonIsBlankParagraph = isBlankParagraph(visibleEnd);
- bool hasBlankParagraphAfterEndOrIsEndOfContent = !selectionEndIsEndOfContent && (endPositonIsBlankParagraph || selectionEndsInParagraphSeperator);
+ bool endPositionIsBlankParagraph = isBlankParagraph(visibleEnd);
+ bool hasBlankParagraphAfterEndOrIsEndOfContent = !selectionEndIsEndOfContent && (endPositionIsBlankParagraph || selectionEndsInParagraphSeperator);
if (startAndEndInSameUnsplittableElement && previousPositionIsBlankParagraph && hasBlankParagraphAfterEndOrIsEndOfContent) {
m_needPlaceholder = false;
Position position;
- if (endPositonIsBlankParagraph)
+ if (endPositionIsBlankParagraph)
position = startOfNextParagraph(startOfNextParagraph(m_downstreamEnd)).deepEquivalent();
else
position = VisiblePosition(m_downstreamEnd).next().deepEquivalent();
diff --git a/Source/WebCore/platform/ScrollAnimator.cpp b/Source/WebCore/platform/ScrollAnimator.cpp
index b60b0fe..1c080cb 100644
--- a/Source/WebCore/platform/ScrollAnimator.cpp
+++ b/Source/WebCore/platform/ScrollAnimator.cpp
@@ -100,9 +100,9 @@
void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset, ScrollClamping)
{
- FloatPoint newPositon = ScrollableArea::scrollPositionFromOffset(offset, toFloatSize(m_scrollableArea.scrollOrigin()));
- FloatSize delta = newPositon - currentPosition();
- m_currentPosition = newPositon;
+ FloatPoint newPosition = ScrollableArea::scrollPositionFromOffset(offset, toFloatSize(m_scrollableArea.scrollOrigin()));
+ FloatSize delta = newPosition - currentPosition();
+ m_currentPosition = newPosition;
notifyPositionChanged(delta);
updateActiveScrollSnapIndexForOffset();
}
diff --git a/Source/WebCore/rendering/line/BreakingContext.h b/Source/WebCore/rendering/line/BreakingContext.h
index d7eb73a..de09223 100644
--- a/Source/WebCore/rendering/line/BreakingContext.h
+++ b/Source/WebCore/rendering/line/BreakingContext.h
@@ -892,26 +892,26 @@
}
// Check if the last breaking position is a soft-hyphen.
if (!hyphenated && style.hyphens() != Hyphens::None) {
- Optional<unsigned> lastBreakingPositon;
+ Optional<unsigned> lastBreakingPosition;
const RenderObject* rendererAtBreakingPosition = nullptr;
if (m_lineBreak.offset() || m_lineBreak.nextBreakablePosition()) {
- lastBreakingPositon = m_lineBreak.offset();
+ lastBreakingPosition = m_lineBreak.offset();
rendererAtBreakingPosition = m_lineBreak.renderer();
} else if (m_current.nextBreakablePosition() && m_current.nextBreakablePosition().value() <= m_current.offset()) {
// We might just be right after the soft-hyphen
- lastBreakingPositon = m_current.nextBreakablePosition().value();
+ lastBreakingPosition = m_current.nextBreakablePosition().value();
rendererAtBreakingPosition = m_current.renderer();
}
- if (lastBreakingPositon) {
+ if (lastBreakingPosition) {
Optional<UChar> characterBeforeBreakingPosition;
// When last breaking position points to the start of the current context, we need to look at the last character from
// the previous non-empty text renderer.
- if (!lastBreakingPositon.value())
+ if (!lastBreakingPosition.value())
characterBeforeBreakingPosition = lastCharacterFromPreviousRenderText;
else if (is<RenderText>(rendererAtBreakingPosition)) {
const auto& textRenderer = downcast<RenderText>(*rendererAtBreakingPosition);
- ASSERT(lastBreakingPositon.value() >= 1 && textRenderer.text().length() > (lastBreakingPositon.value() - 1));
- characterBeforeBreakingPosition = textRenderer.characterAt(lastBreakingPositon.value() - 1);
+ ASSERT(lastBreakingPosition.value() >= 1 && textRenderer.text().length() > (lastBreakingPosition.value() - 1));
+ characterBeforeBreakingPosition = textRenderer.characterAt(lastBreakingPosition.value() - 1);
}
if (characterBeforeBreakingPosition)
hyphenated = characterBeforeBreakingPosition.value() == softHyphen;
