Changeset 29483 in webkit

Timestamp:

Jan 14, 2008 5:31:19 PM (16 years ago)

Author:

eric@webkit.org

Message:

Reviewed by hyatt & eseidel.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16844 RenderText::addLineBoxRects erroneously includes last char for boundingBox

This patch fixes an issue with addLineBoxRects not correctly calculating the
rects due to an off-by-one error in using box->end(). We were assuming that
end() gives the index past the last character, when in fact it gives the
index _of_ the last character.

Eric Seidel and I could not find a way to test this via DRT. This method is
only used by WebKit or Safari for displaying selection rects AFAICT.

• rendering/RenderText.cpp: (WebCore::RenderText::addLineBoxRects):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderText.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-14  Finnur Thorarinsson  <finnur.webkit@gmail.com>
+
+        Reviewed by hyatt & eseidel.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16844
+        RenderText::addLineBoxRects erroneously includes last char for boundingBox
+
+        This patch fixes an issue with addLineBoxRects not correctly calculating the 
+        rects due to an off-by-one error in using box->end(). We were assuming that 
+        end() gives the index past the last character, when in fact it gives the 
+        index _of_ the last character. 
+
+        Eric Seidel and I could not find a way to test this via DRT. This method is 
+        only used by WebKit or Safari for displaying selection rects AFAICT.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::addLineBoxRects):
+
 2008-01-14  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderText.cpp

@@ -212 +212 @@
 
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
-        if (start <= box->start() && box->end() <= end) {
+        // Note: box->end() returns the index of the last character, not the index past it
+        if (start <= box->start() && box->end() < end) {
             IntRect r = IntRect(x + box->xPos(), y + box->yPos(), box->width(), box->height());
             if (useSelectionHeight) {
@@ -221 +222 @@
             rects.append(r);
         } else {
-            unsigned realEnd = min(box->end() + 1, end); // box->end() points at the last char, not after it
+            unsigned realEnd = min(box->end() + 1, end);
             IntRect r = box->selectionRect(x, y, start, realEnd);
             if (!r.isEmpty()) {