Source/core/rendering/RenderInline.h - Issue 351213002: Change RenderObject::style(bool) to accept an enum instead

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/RenderInline.h

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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

Index: Source/core/rendering/RenderInline.h

diff --git a/Source/core/rendering/RenderInline.h b/Source/core/rendering/RenderInline.h

index f676e453d9f5b23261b78ae13745f16eda95100a..bd8f755544c11a1bf084fd356a6aaa468dbada38 100644

--- a/Source/core/rendering/RenderInline.h

+++ b/Source/core/rendering/RenderInline.h

@@ -165,8 +165,8 @@ private:

virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }

- virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;

- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;

+ virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;

+ virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;

virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL;

« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »