Source/core/rendering/InlineFlowBox.cpp - Issue 529753002: Word-Spacing in InlineBox RTL scenario not to ignore if first character is space

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

Issue 529753002: Word-Spacing in InlineBox RTL scenario not to ignore if first character is space (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: TestExpectations update Created 6 years, 3 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

« no previous file with comments | « LayoutTests/platform/linux/fast/text/international/bidi-word-spacing-rtl-expected.txt ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/InlineFlowBox.cpp

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

index 34dc81ea42276238da0b6a82aea1a98c5c20290c..2b7c1fd0f15ae785a398b3c43106ed11b87db8ea 100644

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

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

@@ -382,12 +382,19 @@ float InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, Inlin

if (curr->renderer().isText()) {

InlineTextBox* text = toInlineTextBox(curr);

RenderText& rt = text->renderer();

+ float space = 0;

if (rt.textLength()) {

if (needsWordSpacing && isSpaceOrNewline(rt.characterAt(text->start())))

- logicalLeft += rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();

+ space = rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();

needsWordSpacing = !isSpaceOrNewline(rt.characterAt(text->end()));

}

- text->setLogicalLeft(logicalLeft);

+ if (isLeftToRightDirection()) {

+ logicalLeft += space;

+ text->setLogicalLeft(logicalLeft);

+ } else {

+ text->setLogicalLeft(logicalLeft);

+ logicalLeft += space;

+ }

if (knownToHaveNoOverflow())

minLogicalLeft = std::min(logicalLeft, minLogicalLeft);

logicalLeft += text->logicalWidth();