Source/core/rendering/RenderTextControlMultiLine.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/RenderTextControlMultiLine.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/RenderTextControlMultiLine.h

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

index 73132f5372d746ff221fe967e6acbbd0fcc9101d..3cf3a79be18d815081c4cc4fb4198529860cda31 100644

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

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

@@ -42,7 +42,7 @@ private:

virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERRIDE;

virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE;

// We override the two baseline functions because we want our baseline to be the bottom of our margin box.

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

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

virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE { return -1; }

virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* startStyle) const OVERRIDE;

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