Source/WebCore/rendering/InlineIterator.h - Issue 8586021: Merge 99462

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/WebCore/rendering/InlineIterator.h

Issue 8586021: Merge 99462 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebCore/rendering/InlineIterator.h

===================================================================

--- Source/WebCore/rendering/InlineIterator.h (revision 100575)

+++ Source/WebCore/rendering/InlineIterator.h (working copy)

@@ -464,7 +464,7 @@

template <>

inline void InlineBidiResolver::appendRun()

{

- if (!m_emptyRun && !m_eor.atEnd()) {

+ if (!m_emptyRun && !m_eor.atEnd() && !m_reachedEndOfLine) {

// Keep track of when we enter/leave "unicode-bidi: isolate" inlines.

// Initialize our state depending on if we're starting in the middle of such an inline.

// FIXME: Could this initialize from this->inIsolate() instead of walking up the render tree?