Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: third_party/WebKit/Source/core/editing/FrameCaret.cpp

Issue 2406163004: Simplify the usage of PositionWithAffinity (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/FrameCaret.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameCaret.cpp b/third_party/WebKit/Source/core/editing/FrameCaret.cpp
index 33dc1ecb006e554d4b602e1264e03a285363d870..7f0a26a273b4cab46d4f04ac215948762a325097 100644
--- a/third_party/WebKit/Source/core/editing/FrameCaret.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameCaret.cpp
@@ -140,8 +140,7 @@ bool FrameCaret::caretPositionIsValidForDocument(
if (!isActive())
return true;
- return caretPosition().position().document() == document &&
- !caretPosition().position().isOrphan();
+ return caretPosition().document() == document && !caretPosition().isOrphan();
}
void FrameCaret::invalidateCaretRect(bool forceInvalidation) {
@@ -195,7 +194,7 @@ IntRect FrameCaret::absoluteCaretBounds() {
updateCaretRect(createVisiblePosition(caretPosition()));
}
}
- return absoluteBoundsForLocalRect(caretPosition().position().anchorNode(),
+ return absoluteBoundsForLocalRect(caretPosition().anchorNode(),
localCaretRectWithoutUpdate());
}
@@ -216,8 +215,8 @@ void FrameCaret::paintCaret(GraphicsContext& context,
return;
updateCaretRect(caretPosition());
- CaretBase::paintCaret(caretPosition().position().anchorNode(), context,
- paintOffset, DisplayItem::kCaret);
+ CaretBase::paintCaret(caretPosition().anchorNode(), context, paintOffset,
+ DisplayItem::kCaret);
}
void FrameCaret::dataWillChange(const CharacterData& node) {
@@ -257,7 +256,7 @@ bool FrameCaret::shouldBlinkCaret() const {
return false;
return focusedElement->isShadowIncludingInclusiveAncestorOf(
- caretPosition().position().anchorNode());
+ caretPosition().anchorNode());
}
void FrameCaret::caretBlinkTimerFired(TimerBase*) {

Powered by Google App Engine
This is Rietveld 408576698