Changeset 212976 in webkit

Timestamp:

Feb 24, 2017 4:20:12 PM (7 years ago)

Author:

ap@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Range.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-24  Alexey Proskuryakov  <ap@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  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Range.cpp

@@ -945 +945 @@
             auto& data = downcast<CharacterData>(*node).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);