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

Unified Diff: Source/WebCore/rendering/InlineIterator.h

Issue 12308006: Merge 142793 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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/fast/text/content-following-inline-isolate-with-collapsed-whitespace-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/InlineIterator.h
===================================================================
--- Source/WebCore/rendering/InlineIterator.h (revision 143363)
+++ Source/WebCore/rendering/InlineIterator.h (working copy)
@@ -489,6 +489,14 @@
// We don't need to mark the end of the run because this is implicit: it is either endOfLine or the end of the
// isolate, when we call createBidiRunsForLine it will stop at whichever comes first.
addPlaceholderRunForIsolatedInline(resolver, obj, pos);
+ // FIXME: Inline isolates don't work properly with collapsing whitespace, see webkit.org/b/109624
+ // For now, if we enter an isolate between midpoints, we increment our current midpoint or else
+ // we'll leave the isolate and ignore the content that follows.
+ MidpointState<InlineIterator>& midpointState = resolver.midpointState();
+ if (midpointState.betweenMidpoints && midpointState.midpoints[midpointState.currentMidpoint].object() == obj) {
+ midpointState.betweenMidpoints = false;
+ ++midpointState.currentMidpoint;
+ }
}
private:
« no previous file with comments | « LayoutTests/fast/text/content-following-inline-isolate-with-collapsed-whitespace-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698