third_party/WebKit/Source/core/layout/shapes/BoxShape.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/layout/shapes/BoxShape.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/layout/line/RootInlineBox.cpp ('k') | third_party/WebKit/Source/core/layout/shapes/Shape.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp

diff --git a/third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp b/third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp

index 5d53809b2d47f943929550b77a1a46351cb93022..b94c840be607666957298353125e51a4428b4185 100644

--- a/third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp

+++ b/third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp

@@ -97,9 +97,9 @@ LineSegment BoxShape::getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logi

void BoxShape::buildDisplayPaths(DisplayPaths& paths) const

{

- paths.shape.addRoundedRect(m_bounds.rect(), m_bounds.radii().topLeft(), m_bounds.radii().topRight(), m_bounds.radii().bottomLeft(), m_bounds.radii().bottomRight());

+ paths.shape.addRoundedRect(m_bounds.rect(), m_bounds.getRadii().topLeft(), m_bounds.getRadii().topRight(), m_bounds.getRadii().bottomLeft(), m_bounds.getRadii().bottomRight());

if (shapeMargin())

- paths.marginShape.addRoundedRect(shapeMarginBounds().rect(), shapeMarginBounds().radii().topLeft(), shapeMarginBounds().radii().topRight(), shapeMarginBounds().radii().bottomLeft(), shapeMarginBounds().radii().bottomRight());

+ paths.marginShape.addRoundedRect(shapeMarginBounds().rect(), shapeMarginBounds().getRadii().topLeft(), shapeMarginBounds().getRadii().topRight(), shapeMarginBounds().getRadii().bottomLeft(), shapeMarginBounds().getRadii().bottomRight());

}

} // namespace blink