Source/core/rendering/shapes/ShapeOutsideInfo.h - Issue 185393015: Rename shapeSize and others to make ShapeInfo and friends easier to understand

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: Source/core/rendering/shapes/ShapeOutsideInfo.h

Issue 185393015: Rename shapeSize and others to make ShapeInfo and friends easier to understand (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 10 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

« Source/core/rendering/shapes/ShapeInfo.h ('K') | « Source/core/rendering/shapes/ShapeInsideInfo.cpp ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/shapes/ShapeOutsideInfo.h

diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.h b/Source/core/rendering/shapes/ShapeOutsideInfo.h

index 9e0dfdc2e380e91ac9ed488380cad68859087e6b..99c34a0aa657f619a44ca8939fbd60d298d5a182 100644

--- a/Source/core/rendering/shapes/ShapeOutsideInfo.h

+++ b/Source/core/rendering/shapes/ShapeOutsideInfo.h

@@ -52,11 +52,11 @@ public:

virtual bool lineOverlapsShapeBounds() const OVERRIDE

{

- return computedShape()->lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight);

+ return computedShape()->lineOverlapsShapeMarginBounds(m_referenceBoxLineTop, m_lineHeight);

}

protected:

- virtual LayoutBox resolvedLayoutBox() const OVERRIDE

+ virtual LayoutBox referenceBox() const OVERRIDE

{

if (shapeValue()->layoutBox() == BoxMissing)

return MarginBox;

@@ -77,7 +77,7 @@ private:

LayoutUnit m_leftMarginBoxDelta;

LayoutUnit m_rightMarginBoxDelta;

- LayoutUnit m_lineTop;

+ LayoutUnit m_borderBoxLineTop;

bool m_lineOverlapsShape;

};