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

Unified Diff: third_party/WebKit/Source/core/editing/VisibleUnits.h

Issue 2926823002: Introduce LocalCaretRect for refactoring Local{Caret,Selection}RectPosition() (Closed)
Patch Set: 2017-06-09T13:08:12 Created 3 years, 6 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/VisibleUnits.h
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.h b/third_party/WebKit/Source/core/editing/VisibleUnits.h
index 0f2716923ac26cac73fd2c9f3622e3fe80123deb..75897d73b88ccddd5eab5e45520cd398450c59d8 100644
--- a/third_party/WebKit/Source/core/editing/VisibleUnits.h
+++ b/third_party/WebKit/Source/core/editing/VisibleUnits.h
@@ -64,6 +64,18 @@ struct InlineBoxPosition {
}
};
+// This struct represents local caret rectangle in |layout_object|.
+struct LocalCaretRect {
+ LayoutObject* layout_object = nullptr;
+ LayoutRect rect;
+
+ LocalCaretRect() = default;
+ LocalCaretRect(LayoutObject* layout_object, const LayoutRect& rect)
+ : layout_object(layout_object), rect(rect) {}
+
+ bool IsEmpty() const { return !layout_object || rect.IsEmpty(); }
+};
+
// The print for |InlineBoxPosition| is available only for testing
// in "webkit_unit_tests", and implemented in
// "core/editing/VisibleUnitsTest.cpp".
@@ -319,10 +331,10 @@ ComputeInlineBoxPosition(const PositionInFlatTree&,
CORE_EXPORT InlineBoxPosition ComputeInlineBoxPosition(const VisiblePosition&);
// Rect is local to the returned layoutObject
-CORE_EXPORT LayoutRect LocalCaretRectOfPosition(const PositionWithAffinity&,
- LayoutObject*&);
-CORE_EXPORT LayoutRect
-LocalCaretRectOfPosition(const PositionInFlatTreeWithAffinity&, LayoutObject*&);
+CORE_EXPORT LocalCaretRect
+LocalCaretRectOfPosition(const PositionWithAffinity&);
+CORE_EXPORT LocalCaretRect
+LocalCaretRectOfPosition(const PositionInFlatTreeWithAffinity&);
bool HasRenderedNonAnonymousDescendantsWithHeight(LayoutObject*);
// Returns a hit-tested VisiblePosition for the given point in contents-space

Powered by Google App Engine
This is Rietveld 408576698