diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 12:00:58 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 17:37:46 +0100 |
| commit | d7957e4817d6aa730d583fb56e2556bb4e626fb0 (patch) | |
| tree | 4ef16852bf4182ac881edba394c82076750fde0e /Source | |
| parent | f36dc73e3362e8a55ed9f8a0baa460d24a937c51 (diff) | |
| download | external_webkit-d7957e4817d6aa730d583fb56e2556bb4e626fb0.zip external_webkit-d7957e4817d6aa730d583fb56e2556bb4e626fb0.tar.gz external_webkit-d7957e4817d6aa730d583fb56e2556bb4e626fb0.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/rendering/RenderFlexibleBox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |