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

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

Issue 24055009: Isolate elements are treated as neutral in UBA however Blink UBA implementation iterates over all t… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Proposed patch v3 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 | « Source/core/rendering/InlineIterator.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockLineLayout.cpp
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
index bd208707bc42e89ad0632a27f58e17f67fe864b0..6235fdd924926b08191f52284ed915101b2f545d 100644
--- a/Source/core/rendering/RenderBlockLineLayout.cpp
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp
@@ -244,7 +244,7 @@ static TextDirection determinePlaintextDirectionality(RenderObject* root, Render
observer.setStatus(BidiStatus(root->style()->direction(), isOverride(root->style()->unicodeBidi())));
while (!iter.atEnd()) {
if (observer.inIsolate()) {
- iter.increment(&observer, InlineIterator::FastIncrementInlineRenderer);
+ iter.increment(&observer, InlineIterator::FastIncrementInIsolatedRenderer);
continue;
}
if (iter.atParagraphSeparator())
@@ -2411,7 +2411,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
if (toRenderCombineText(object)->isCombined())
continue;
}
- resolver.increment();
+ resolver.position().increment(&resolver);
}
resolver.commitExplicitEmbedding();
}
@@ -2566,7 +2566,7 @@ InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo
SegmentRangeList& segmentRanges = shapeInsideInfo->segmentRanges();
for (unsigned i = 0; i < segments.size() && !end.atEnd(); i++) {
- InlineIterator segmentStart = resolver.position();
+ const InlineIterator segmentStart = resolver.position();
end = nextSegmentBreak(resolver, lineInfo, renderTextInfo, lastFloatFromPreviousLine, consecutiveHyphenatedLines, wordMeasurements);
ASSERT(segmentRanges.size() == i);
@@ -2818,7 +2818,7 @@ InlineIterator LineBreaker::nextSegmentBreak(InlineBidiResolver& resolver, LineI
if (iteratorIsBeyondEndOfRenderCombineText(lBreak, combineRenderer)) {
ASSERT(iteratorIsBeyondEndOfRenderCombineText(resolver.position(), combineRenderer));
lBreak.increment();
- resolver.increment();
+ resolver.position().increment(&resolver);
}
}
« no previous file with comments | « Source/core/rendering/InlineIterator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698