Commit 4b14f77f authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot

Make SelectionModifier to use NGInlineCursor

This patch changes |SelectionModifier| to use |NGInlineCursor| instead of
|NGPaintFragment| for prepration of migrating |NGFragmentItem|.

Bug: 982194
Change-Id: I7c962dc3f7e0fd9611b6b83baf5c74d58f4c8e7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875354
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Auto-Submit: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708923}
parent 208b2229
...@@ -159,9 +159,9 @@ base::Optional<TextDirection> DirectionAt(const VisiblePosition& position) { ...@@ -159,9 +159,9 @@ base::Optional<TextDirection> DirectionAt(const VisiblePosition& position) {
return base::nullopt; return base::nullopt;
if (NGInlineFormattingContextOf(adjusted.GetPosition())) { if (NGInlineFormattingContextOf(adjusted.GetPosition())) {
if (const NGPaintFragment* fragment = const NGInlineCursor& cursor = ComputeNGCaretPosition(adjusted).cursor;
ComputeNGCaretPosition(adjusted).PaintFragment()) if (cursor)
return fragment->PhysicalFragment().ResolvedDirection(); return cursor.CurrentResolvedDirection();
return base::nullopt; return base::nullopt;
} }
...@@ -181,11 +181,11 @@ base::Optional<TextDirection> LineDirectionAt(const VisiblePosition& position) { ...@@ -181,11 +181,11 @@ base::Optional<TextDirection> LineDirectionAt(const VisiblePosition& position) {
return base::nullopt; return base::nullopt;
if (NGInlineFormattingContextOf(adjusted.GetPosition())) { if (NGInlineFormattingContextOf(adjusted.GetPosition())) {
if (const NGPaintFragment* fragment = NGInlineCursor line = ComputeNGCaretPosition(adjusted).cursor;
ComputeNGCaretPosition(adjusted).PaintFragment()) { if (!line)
return ParagraphDirectionOf(*fragment); return base::nullopt;
} line.MoveToContainingLine();
return base::nullopt; return line.CurrentBaseDirection();
} }
if (const InlineBox* box = if (const InlineBox* box =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment