Source/core/rendering/RenderBlock.h - Issue 23567004: Fix alignment for bidirectional text.

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/RenderBlock.h

Issue 23567004: Fix alignment for bidirectional text. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Trying Again Created 7 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/win/fast/text/international/unicode-bidi-plaintext-in-textarea-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/RenderBlock.h

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

index 6ccfd8ef97ae789207c7258492b363ee8f48cbc9..92bc52bca4ef32a0cf09fd44aa4df7f79da3077a 100644

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

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

@@ -347,7 +347,7 @@ public:

LayoutUnit collapsedMarginBeforeForChild(const RenderBox* child) const;

LayoutUnit collapsedMarginAfterForChild(const RenderBox* child) const;

- void updateLogicalWidthForAlignment(const ETextAlign&, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, int expansionOpportunityCount);

+ void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, int expansionOpportunityCount);

virtual void updateFirstLetter();

@@ -941,7 +941,7 @@ private:

// End helper functions and structs used by layoutBlockChildren.

// Helper function for layoutInlineChildren()

- RootInlineBox* createLineBoxesFromBidiRuns(BidiRunList<BidiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, WordMeasurements&);

+ RootInlineBox* createLineBoxesFromBidiRuns(unsigned bidiLevel, BidiRunList<BidiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, WordMeasurements&);

void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild);

void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines);

void updateShapeAndSegmentsForCurrentLine(ShapeInsideInfo*&, LayoutUnit&, LineLayoutState&);