Title: [198286] branches/safari-601-branch/Source/WebCore
- Revision
- 198286
- Author
- matthew_han...@apple.com
- Date
- 2016-03-16 10:17:46 -0700 (Wed, 16 Mar 2016)
Log Message
Merge r192054. rdar://problem/25152937
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198285 => 198286)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-16 16:58:29 UTC (rev 198285)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-16 17:17:46 UTC (rev 198286)
@@ -1,3 +1,10 @@
+2016-03-16 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r192054. rdar://problem/25152937
+
+ * rendering/OrderIterator.cpp:
+ (WebCore::OrderIterator::next):
+
2016-02-26 Babak Shafiei <bshaf...@apple.com>
Roll out r196637. rdar://problem/24494562
Modified: branches/safari-601-branch/Source/WebCore/rendering/OrderIterator.cpp (198285 => 198286)
--- branches/safari-601-branch/Source/WebCore/rendering/OrderIterator.cpp 2016-03-16 16:58:29 UTC (rev 198285)
+++ branches/safari-601-branch/Source/WebCore/rendering/OrderIterator.cpp 2016-03-16 17:17:46 UTC (rev 198286)
@@ -59,16 +59,14 @@
continue;
}
- if (m_orderIndex == endIndex)
- return nullptr;
-
- if (m_orderIndex != cInvalidIndex) {
+ if (m_orderIndex != cInvalidIndex)
++m_orderIndex;
- if (m_orderIndex == endIndex)
- return nullptr;
- } else
+ else
m_orderIndex = 0;
+ if (m_orderIndex == endIndex)
+ return nullptr;
+
m_currentChild = m_containerBox.firstChildBox();
} while (!m_currentChild || m_currentChild->style().order() != m_orderValues[m_orderIndex]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
