Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1524)

Unified Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 26315003: Bidi-Isolate inlines break layout with collapsed whitespace (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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
Index: Source/core/rendering/RenderBlockLineLayout.cpp
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
index 8e4c88471ce06321619fd50c1e40465271b38dbf..470e88a8bd90f6e9e0c76ff78008b39d90e7f98b 100644
--- a/Source/core/rendering/RenderBlockLineLayout.cpp
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp
@@ -1303,6 +1303,8 @@ static inline void constructBidiRunsForSegment(InlineBidiResolver& topResolver,
ASSERT(isolatedInline);
InlineBidiResolver isolatedResolver;
+ LineMidpointState& isolatedLineMidpointState = isolatedResolver.midpointState();
+ isolatedLineMidpointState = topResolver.midpointStateForIsolatedRun(isolatedRun);
EUnicodeBidi unicodeBidi = isolatedInline->style()->unicodeBidi();
TextDirection direction = isolatedInline->style()->direction();
if (unicodeBidi == Plaintext) {
@@ -1339,8 +1341,12 @@ static inline void constructBidiRunsForSegment(InlineBidiResolver& topResolver,
// to the top resolver's list for later processing.
if (!isolatedResolver.isolatedRuns().isEmpty()) {
topResolver.isolatedRuns().append(isolatedResolver.isolatedRuns());
- isolatedResolver.isolatedRuns().clear();
currentRoot = isolatedInline;
+ while (!isolatedResolver.isolatedRuns().isEmpty()) {
leviw_travelin_and_unemployed 2013/10/07 21:58:42 It's weird to have nested while loops with the sam
+ BidiRun* run = isolatedResolver.isolatedRuns().last();
+ isolatedResolver.isolatedRuns().removeLast();
+ topResolver.setMidpointStateForIsolatedRun(run, isolatedResolver.midpointStateForIsolatedRun(run));
+ }
}
}
}

Powered by Google App Engine
This is Rietveld 408576698