Source/core/rendering/InlineBox.cpp - 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/InlineBox.cpp

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/InlineBox.cpp

diff --git a/Source/core/rendering/InlineBox.cpp b/Source/core/rendering/InlineBox.cpp

index 4014c7383957c102001093d6694d0a896516aa94..fc45cefffb4a8e23dd06a8cd2cbf9fe3ae1dcf83 100644

--- a/Source/core/rendering/InlineBox.cpp

+++ b/Source/core/rendering/InlineBox.cpp

@@ -137,12 +137,12 @@ float InlineBox::logicalHeight() const

int InlineBox::baselinePosition(FontBaseline baselineType) const

{

- return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);

+ return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine() ? FirstLineStyle : OwnStyle, isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);

}

LayoutUnit InlineBox::lineHeight() const

{

- return boxModelObject()->lineHeight(m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);

+ return boxModelObject()->lineHeight(m_bitfields.firstLine() ? FirstLineStyle : OwnStyle, isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);

}

int InlineBox::caretMinOffset() const

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