Title: [213139] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 213139
- Author
- carlo...@webkit.org
- Date
- 2017-02-28 01:39:54 -0800 (Tue, 28 Feb 2017)
Log Message
Merge r212976 - Build fix for newer clang
https://bugs.webkit.org/show_bug.cgi?id=168849
rdar://problem/30638741
Reviewed by Ryosuke Niwa.
* dom/Range.cpp: (WebCore::Range::toString): std::max(0, <unsigned>) is not meaningful,
and now triggers a warning.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213138 => 213139)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:31:07 UTC (rev 213138)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:39:54 UTC (rev 213139)
@@ -1,3 +1,14 @@
+2017-02-24 Alexey Proskuryakov <a...@apple.com>
+
+ Build fix for newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=168849
+ rdar://problem/30638741
+
+ Reviewed by Ryosuke Niwa.
+
+ * dom/Range.cpp: (WebCore::Range::toString): std::max(0, <unsigned>) is not meaningful,
+ and now triggers a warning.
+
2017-02-24 Miguel Gomez <mago...@igalia.com>
[GTK] WebkitWebProcess crashes on exit on nvidia if threaded compositing is enabled
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Range.cpp (213138 => 213139)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Range.cpp 2017-02-28 09:31:07 UTC (rev 213138)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Range.cpp 2017-02-28 09:39:54 UTC (rev 213139)
@@ -944,7 +944,7 @@
if (type == Node::TEXT_NODE || type == Node::CDATA_SECTION_NODE) {
auto& data = ""
unsigned length = data.length();
- unsigned start = node == &startContainer() ? std::min(std::max(0U, m_start.offset()), length) : 0U;
+ unsigned start = node == &startContainer() ? std::min(m_start.offset(), length) : 0U;
unsigned end = node == &endContainer() ? std::min(std::max(start, m_end.offset()), length) : length;
builder.append(data, start, end - start);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes