Source/core/rendering/RenderButton.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/RenderButton.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, 6 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/RenderButton.cpp

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

index 2dad45f941b1bb44efcac5d55cc8e8b9fef26be3..30512d8b881e8a1ba8a47677c1809761a963dbde 100644

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

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

@@ -115,7 +115,7 @@ LayoutRect RenderButton::controlClipRect(const LayoutPoint& additionalOffset) co

return LayoutRect(additionalOffset.x() + borderLeft(), additionalOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());

}

-int RenderButton::baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const

+int RenderButton::baselinePosition(FontBaseline baseline, OwnOrFirstLineStyle firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const

{

ASSERT(linePositionMode == PositionOnContainingLine);

// We want to call the RenderBlock version of firstLineBoxBaseline to

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