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

Unified Diff: Source/core/editing/VisiblePosition.cpp

Issue 1325443002: Introduce localCaretRectOf() for VisiblePosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-28T23:08:19 Rebase after absoluteCaretRectBoundsOf() Created 5 years, 4 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
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisiblePosition.cpp
diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
index 48bc675d39487d8d2abcf5ba6bc56e99530dcf27..5b66a19eaa2264c5c3db2c2a977fed5352df144a 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -687,16 +687,17 @@ UChar32 characterBefore(const VisiblePosition& visiblePosition)
return characterAfter(previousPositionOf(visiblePosition));
}
-LayoutRect VisiblePosition::localCaretRect(LayoutObject*& layoutObject) const
+// TODO(yosin) We should move |localCaretRect()| to "VisibleUnits.cpp".
+static LayoutRect localCaretRectOf(const VisiblePosition& visiblePosition, LayoutObject*& layoutObject)
{
- PositionWithAffinity positionWithAffinity(m_deepPosition, m_affinity);
+ PositionWithAffinity positionWithAffinity(visiblePosition.deepEquivalent(), visiblePosition.affinity());
return localCaretRectOfPosition(positionWithAffinity, layoutObject);
}
IntRect absoluteCaretBoundsOf(const VisiblePosition& visiblePosition)
{
LayoutObject* layoutObject;
- LayoutRect localRect = visiblePosition.localCaretRect(layoutObject);
+ LayoutRect localRect = localCaretRectOf(visiblePosition, layoutObject);
if (localRect.isEmpty() || !layoutObject)
return IntRect();
@@ -712,7 +713,7 @@ int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition& visib
return 0;
LayoutObject* layoutObject;
- LayoutRect localRect = visiblePosition.localCaretRect(layoutObject);
+ LayoutRect localRect = localCaretRectOf(visiblePosition, layoutObject);
if (localRect.isEmpty() || !layoutObject)
return 0;
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698