Title: [206416] branches/safari-602-branch/Source/WebCore
- Revision
- 206416
- Author
- bshaf...@apple.com
- Date
- 2016-09-26 23:16:10 -0700 (Mon, 26 Sep 2016)
Log Message
Merge r206375. rdar://problem/28484393
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206415 => 206416)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-27 06:14:23 UTC (rev 206415)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-27 06:16:10 UTC (rev 206416)
@@ -1,5 +1,21 @@
2016-09-26 Babak Shafiei <bshaf...@apple.com>
+ Merge r206375. rdar://problem/28484393
+
+ 2016-09-26 Per Arne Vollan <pvol...@apple.com>
+
+ [Win][Debug] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=162550
+
+ Reviewed by Alex Christensen.
+
+ Windows headers need the FragmentForwardIterator '==' operator in debug mode.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::FragmentForwardIterator::operator==):
+
+2016-09-26 Babak Shafiei <bshaf...@apple.com>
+
Merge r206241. rdar://problem/28450514
2016-09-26 Babak Shafiei <bshaf...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/rendering/SimpleLineLayout.cpp (206415 => 206416)
--- branches/safari-602-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-09-27 06:14:23 UTC (rev 206415)
+++ branches/safari-602-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-09-27 06:16:10 UTC (rev 206416)
@@ -567,6 +567,7 @@
}
bool operator!=(const FragmentForwardIterator& other) const { return m_fragmentIndex != other.m_fragmentIndex; }
+ bool operator==(const FragmentForwardIterator& other) const { return m_fragmentIndex == other.m_fragmentIndex; }
unsigned operator*() const { return m_fragmentIndex; }
private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
