Title: [198636] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 198636
- Author
- matthew_han...@apple.com
- Date
- 2016-03-24 11:14:54 -0700 (Thu, 24 Mar 2016)
Log Message
Merge custom patch. rdar://problem/25152415.
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198635 => 198636)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-24 18:14:28 UTC (rev 198635)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-24 18:14:54 UTC (rev 198636)
@@ -1,5 +1,11 @@
2016-03-24 Matthew Hanson <matthew_han...@apple.com>
+ Merge custom patch. rdar://problem/25152415.
+
+ * rendering/OrderIterator.cpp:
+
+2016-03-24 Matthew Hanson <matthew_han...@apple.com>
+
Merge r198157. rdar://problem/25271134
2016-03-14 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/OrderIterator.cpp (198635 => 198636)
--- branches/safari-601.1.46-branch/Source/WebCore/rendering/OrderIterator.cpp 2016-03-24 18:14:28 UTC (rev 198635)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/OrderIterator.cpp 2016-03-24 18:14:54 UTC (rev 198636)
@@ -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
