| Index: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
|
| index 018acd1953f2bd04365bda3a9bc14e14918f4fe2..8e9b6d65ad1d26600dda847048353a06e2aac8e4 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
|
| @@ -72,11 +72,9 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
|
| TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
|
| TestDisplayItem(layoutView(), documentBackgroundType),
|
| TestDisplayItem(textInlineBox, foregroundType),
|
| - TestDisplayItem(document()
|
| - .frame()
|
| - ->selection()
|
| - .caretDisplayItemClientForTesting(),
|
| - DisplayItem::kCaret), // New!
|
| + TestDisplayItem(
|
| + document().frame()->selection().getCaretDisplayItemClient(),
|
| + DisplayItem::kCaret), // New!
|
| TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
|
| } else {
|
| EXPECT_DISPLAY_LIST(
|
| @@ -86,11 +84,9 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
|
| TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
|
| TestDisplayItem(layoutView(), documentBackgroundType),
|
| TestDisplayItem(textInlineBox, foregroundType),
|
| - TestDisplayItem(document()
|
| - .frame()
|
| - ->selection()
|
| - .caretDisplayItemClientForTesting(),
|
| - DisplayItem::kCaret), // New!
|
| + TestDisplayItem(
|
| + document().frame()->selection().getCaretDisplayItemClient(),
|
| + DisplayItem::kCaret), // New!
|
| TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
|
| TestDisplayItem(layoutView(),
|
| DisplayItem::clipTypeToEndClipType(
|
| @@ -102,7 +98,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
|
| TestDisplayItem(layoutView(), documentBackgroundType),
|
| TestDisplayItem(textInlineBox, foregroundType),
|
| TestDisplayItem(
|
| - document().frame()->selection().caretDisplayItemClientForTesting(),
|
| + document().frame()->selection().getCaretDisplayItemClient(),
|
| DisplayItem::kCaret)); // New!
|
| }
|
| }
|
|
|