third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h ('k') | third_party/WebKit/Source/core/paint/PaintLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 afed2ed386ea66855f8cbc815455208663a3cb7f..6f0e06e53564bcb6c90491d8103468fb997f45af 100644

--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp

@@ -25,14 +25,14 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, FullDocumentPaintingWith

LayoutObject& divLayoutObject = *document().body()->firstChild()->layoutObject();

InlineTextBox& textInlineBox = *toLayoutText(div.firstChild()->layoutObject())->firstTextBox();

- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,

+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,

TestDisplayItem(layoutView(), documentBackgroundType),

TestDisplayItem(textInlineBox, foregroundType));

div.focus();

document().view()->updateAllLifecyclePhases();

- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 3,

+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,

TestDisplayItem(layoutView(), documentBackgroundType),

TestDisplayItem(textInlineBox, foregroundType),

TestDisplayItem(divLayoutObject, DisplayItem::Caret)); // New!

@@ -46,7 +46,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, InlineRelayout)

LayoutText& text = *toLayoutText(divBlock.firstChild());

InlineTextBox& firstTextBox = *text.firstTextBox();

- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,

+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,

TestDisplayItem(layoutView(), documentBackgroundType),

TestDisplayItem(firstTextBox, foregroundType));

@@ -57,7 +57,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, InlineRelayout)

InlineTextBox& newFirstTextBox = *newText.firstTextBox();

InlineTextBox& secondTextBox = *newText.firstTextBox()->nextTextBox();

- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 3,

+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,

TestDisplayItem(layoutView(), documentBackgroundType),

TestDisplayItem(newFirstTextBox, foregroundType),

TestDisplayItem(secondTextBox, foregroundType));