Commit c279a572 authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot

[EditingNG] Utilize NGInlineCursor in

PaintControllerPaintTest.FullDocumentPaintingWithCaret

This patch changes |PaintControllerPaintTest.FullDocumentPaintingWithCaret| to
use |NGInlineCursor| to handle both |NGFragmentItem| and |NGPaintFragment|
for preparation of enabling EditingNG.

This patch is similar to the CL[1].

[1] http://crrev.com/c/2108423: [NGFragmentItem] Utilize NGInlineCursor in
PaintControllerPaintTest.InlineRelayout

Bug: 707656
Change-Id: I01dd91bcab0f59f23eb6770853ff37406199a231
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2251521
Auto-Submit: Yoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780144}
parent f845de2b
......@@ -32,12 +32,17 @@ TEST_P(PaintControllerPaintTest, FullDocumentPaintingWithCaret) {
GetDocument().GetPage()->GetFocusController().SetActive(true);
GetDocument().GetPage()->GetFocusController().SetFocused(true);
auto& div = *To<Element>(GetDocument().body()->firstChild());
InlineTextBox& text_inline_box =
*ToLayoutText(div.firstChild()->GetLayoutObject())->FirstTextBox();
auto& layout_text = *To<Text>(div.firstChild())->GetLayoutObject();
const DisplayItemClient* text_inline_box = layout_text.FirstTextBox();
if (layout_text.IsInLayoutNGInlineFormattingContext()) {
NGInlineCursor cursor;
cursor.MoveTo(layout_text);
text_inline_box = cursor.Current().GetDisplayItemClient();
}
EXPECT_THAT(RootPaintController().GetDisplayItemList(),
ElementsAre(IsSameId(&ViewScrollingBackgroundClient(),
kDocumentBackgroundType),
IsSameId(&text_inline_box, kForegroundType)));
IsSameId(text_inline_box, kForegroundType)));
div.focus();
UpdateAllLifecyclePhasesForTest();
......@@ -46,7 +51,7 @@ TEST_P(PaintControllerPaintTest, FullDocumentPaintingWithCaret) {
RootPaintController().GetDisplayItemList(),
ElementsAre(
IsSameId(&ViewScrollingBackgroundClient(), kDocumentBackgroundType),
IsSameId(&text_inline_box, kForegroundType),
IsSameId(text_inline_box, kForegroundType),
// New!
IsSameId(&CaretDisplayItemClientForTesting(), DisplayItem::kCaret)));
}
......
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