Source/core/rendering/RenderBlockLineLayout.cpp - Issue 59753002: text-align-last only affect to the last line when text-align is justify.

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/RenderBlockLineLayout.cpp

Issue 59753002: text-align-last only affect to the last line when text-align is justify. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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

« LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html ('K') | « LayoutTests/platform/linux/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlockLineLayout.cpp

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

index bf4ef4a89f934be907b19d5d2fdbbf6cfc5b95c5..7e3831d2ed55c887b829520464278ddba099de48 100644

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

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

@@ -320,6 +320,9 @@ ETextAlign RenderBlockFlow::textAlignmentForLine(bool endsWithSoftBreak) const

if (!RuntimeEnabledFeatures::css3TextEnabled())

return (alignment == JUSTIFY) ? TASTART : alignment;

+ if (alignment != JUSTIFY)

+ return alignment;

TextAlignLast alignmentLast = style()->textAlignLast();

switch (alignmentLast) {

case TextAlignLastStart:

@@ -335,8 +338,6 @@ ETextAlign RenderBlockFlow::textAlignmentForLine(bool endsWithSoftBreak) const

case TextAlignLastJustify:

return JUSTIFY;

case TextAlignLastAuto:

- if (alignment != JUSTIFY)

- return alignment;

if (style()->textJustify() == TextJustifyDistribute)

return JUSTIFY;

return TASTART;