Source/core/layout/LayoutDeprecatedFlexibleBox.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/LayoutDeprecatedFlexibleBox.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/LayoutDeprecatedFlexibleBox.cpp

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

index e5608f657b12dc899683182dff54201c84e6b6e6..2a8ad0551d0a5c3bd95186e767c029658669ae95 100644

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

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

@@ -175,9 +175,9 @@ static LayoutUnit contentHeightForChild(LayoutBox* child)

return child->logicalHeight() - child->borderAndPaddingLogicalHeight();

}

-void LayoutDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const LayoutStyle& newStyle)

+void LayoutDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)

{

- const LayoutStyle* oldStyle = style();

+ const ComputedStyle* oldStyle = style();

if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNone())

clearLineClamp();