Source/core/layout/LayoutTextControlMultiLine.cpp - Issue 1033943002: Rename LayoutStyle to papayawhip

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/layout/LayoutTextControlMultiLine.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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:

Index: Source/core/layout/LayoutTextControlMultiLine.cpp

diff --git a/Source/core/layout/LayoutTextControlMultiLine.cpp b/Source/core/layout/LayoutTextControlMultiLine.cpp

index 6b4113c8f67986c7da37a311f80af7a776afa29a..b683198ee135118022440099c5fd42196270b938 100644

--- a/Source/core/layout/LayoutTextControlMultiLine.cpp

+++ b/Source/core/layout/LayoutTextControlMultiLine.cpp

@@ -75,9 +75,9 @@ int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool

return LayoutBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);

}

-PassRefPtr<LayoutStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const LayoutStyle& startStyle) const

+PassRefPtr<ComputedStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const ComputedStyle& startStyle) const

{

- RefPtr<LayoutStyle> textBlockStyle = LayoutStyle::create();

+ RefPtr<ComputedStyle> textBlockStyle = ComputedStyle::create();

textBlockStyle->inheritFrom(startStyle);

adjustInnerEditorStyle(*textBlockStyle);

textBlockStyle->setDisplay(BLOCK);