Commit 06b09b44 authored by Yoichi Osato's avatar Yoichi Osato Committed by Commit Bot

[LayoutNG] Refactor is_text_direction_rtl computation.

CompositedSelectionBound.is_text_direction_rtl is assigned twice
redundantly.
This patch unifies it.

Change-Id: I6bb3e2a4139de363ec76af03b54f8137f7e8e4fc
Reviewed-on: https://chromium-review.googlesource.com/885679Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532097}
parent b29e2321
...@@ -385,10 +385,9 @@ static CompositedSelectionBound PositionInGraphicsLayerBacking( ...@@ -385,10 +385,9 @@ static CompositedSelectionBound PositionInGraphicsLayerBacking(
return CompositedSelectionBound(); return CompositedSelectionBound();
CompositedSelectionBound bound; CompositedSelectionBound bound;
// Flipped blocks writing mode is not only vertical but also right to left. bound.is_text_direction_rtl =
if (!layout_object->Style()->IsHorizontalWritingMode()) { layout_object->HasFlippedBlocksWritingMode() ||
bound.is_text_direction_rtl = layout_object->HasFlippedBlocksWritingMode(); PrimaryDirectionOf(*position.AnchorNode()) == TextDirection::kRtl;
}
LayoutPoint edge_top_in_layer, edge_bottom_in_layer; LayoutPoint edge_top_in_layer, edge_bottom_in_layer;
std::tie(edge_top_in_layer, edge_bottom_in_layer) = std::tie(edge_top_in_layer, edge_bottom_in_layer) =
...@@ -441,13 +440,6 @@ CompositedSelection RenderedPosition::ComputeCompositedSelection( ...@@ -441,13 +440,6 @@ CompositedSelection RenderedPosition::ComputeCompositedSelection(
DCHECK(!visible_selection.IsNone()); DCHECK(!visible_selection.IsNone());
selection.type = selection.type =
visible_selection.IsRange() ? kRangeSelection : kCaretSelection; visible_selection.IsRange() ? kRangeSelection : kCaretSelection;
selection.start.is_text_direction_rtl |=
PrimaryDirectionOf(*visible_selection.Start().AnchorNode()) ==
TextDirection::kRtl;
selection.end.is_text_direction_rtl |=
PrimaryDirectionOf(*visible_selection.End().AnchorNode()) ==
TextDirection::kRtl;
return selection; return selection;
} }
......
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