InlineTextBox's m_len can be an unsigned (rather than an unsigned short)

[WebKit-https.git] / Source / WebCore / rendering / RenderTextLineBoxes.cpp

diff --git a/Source/WebCore/rendering/RenderTextLineBoxes.cpp b/Source/WebCore/rendering/RenderTextLineBoxes.cpp
index 8ae0d60c1c73303e1768e29dc3220da9588bbf07..3ac68a45f1d144ba8b4eced2da6c1b4e56f1d92a 100644 (file)
--- a/Source/WebCore/rendering/RenderTextLineBoxes.cpp
+++ b/Source/WebCore/rendering/RenderTextLineBoxes.cpp
@@ -464,7 +464,7 @@ void RenderTextLineBoxes::setSelectionState(RenderText& renderer, RenderObject::
 
 static IntRect ellipsisRectForBox(const InlineTextBox& box, unsigned start, unsigned end)
 {
-    unsigned short truncation = box.truncation();
+    unsigned truncation = box.truncation();
     if (truncation == cNoTruncation)
         return IntRect();
 
@@ -473,8 +473,9 @@ static IntRect ellipsisRectForBox(const InlineTextBox& box, unsigned start, unsi
         return IntRect();
     
     IntRect rect;
-    int ellipsisStartPosition = std::max<int>(start - box.start(), 0);
-    int ellipsisEndPosition = std::min<int>(end - box.start(), box.len());
+    unsigned ellipsisStartPosition = start > box.start() ? start - box.start() : 0;
+    ASSERT(end >= box.start());
+    unsigned ellipsisEndPosition = std::min(end - box.start(), box.len());
     
     // The ellipsis should be considered to be selected if the end of
     // the selection is past the beginning of the truncation and the