From d7957e4817d6aa730d583fb56e2556bb4e626fb0 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 12 Apr 2012 12:00:58 +0100 Subject: Cherry-pick WebKit change r90568 to fix LayoutTest crashes fast/flexbox/crash-button-input-autofocus.html fast/flexbox/crash-button-keygen.html fast/flexbox/crash-button-relayout.html Patch manually applied due to file rename. See http://trac.webkit.org/changeset/90568 Bug: 6328974 Change-Id: I0cee4daaea2e6fa2b9fae7d7dd81b4541561e969 --- Source/WebCore/rendering/RenderFlexibleBox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp index 4356f4c..99c7e0b 100644 --- a/Source/WebCore/rendering/RenderFlexibleBox.cpp +++ b/Source/WebCore/rendering/RenderFlexibleBox.cpp @@ -95,8 +95,8 @@ public: 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; } -- cgit v1.1