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

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

index daa68ce334ab9afce8a667b1fbff93d7248526ca..574ae3dc75813a0f1cd675e580c4a8b3b6ab2636 100644

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

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

@@ -346,7 +346,7 @@ PassRefPtr<RenderStyle> RenderTextControlSingleLine::createInnerEditorStyle(cons

if (m_desiredInnerEditorLogicalHeight >= 0)

textBlockStyle->setLogicalHeight(Length(m_desiredInnerEditorLogicalHeight, Fixed));

// Do not allow line-height to be smaller than our default.

- if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes))

+ if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(FirstLineStyle, HorizontalLine, PositionOfInteriorLineBoxes))

textBlockStyle->setLineHeight(RenderStyle::initialLineHeight());

textBlockStyle->setDisplay(BLOCK);

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