Source/WebCore/rendering/RenderFlexibleBox.cpp - Issue 7344020: Merge 90568

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/RenderFlexibleBox.cpp

Issue 7344020: Merge 90568 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 5 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:

Index: Source/WebCore/rendering/RenderFlexibleBox.cpp

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

--- Source/WebCore/rendering/RenderFlexibleBox.cpp (revision 90847)

+++ Source/WebCore/rendering/RenderFlexibleBox.cpp (working copy)

@@ -89,8 +89,8 @@

m_currentChild = m_forward ? m_currentChild->nextSiblingBox() : m_currentChild->previousSiblingBox();

if (m_currentChild && m_currentChild->style()->boxOrdinalGroup() > m_lastOrdinal)

m_lastOrdinal = m_currentChild->style()->boxOrdinalGroup();

- } while (!m_currentChild || m_currentChild->style()->boxOrdinalGroup() != m_currentOrdinal

- || m_currentChild->style()->visibility() == COLLAPSE);

+ } while (!m_currentChild || (!m_currentChild->isAnonymous()

+ && (m_currentChild->style()->boxOrdinalGroup() != m_currentOrdinal || m_currentChild->style()->visibility() == COLLAPSE)));

return m_currentChild;

}

« no previous file with comments | « LayoutTests/fast/flexbox/crash-button-relayout-expected.txt ('k') | no next file » | no next file with comments »