Changeset 21940 in webkit

Timestamp:

Jun 1, 2007 2:04:49 PM (17 years ago)

Author:

bdash

Message:

Merge r21897.

Reviewed by Darin.

<rdar://problem/5200795> REGRESSION (r21057): lineBoxRects doesn't match actual text when wrapping occurs

Use box->end() instead of box->len().

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

Location:

branches/Safari-5522/WebCore

Files:

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

branches/Safari-5522/WebCore/ChangeLog

@@ +1 @@
+2007-05-30  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        <rdar://problem/5200795> REGRESSION (r21057): lineBoxRects doesn't match actual text when wrapping occurs
+
+        Use box->end() instead of box->len().
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::addLineBoxRects):
+
 2007-05-25  Geoffrey Garen  <ggaren@apple.com>
 

branches/Safari-5522/WebCore/rendering/RenderText.cpp

@@ -185 +185 @@
             rects.append(IntRect(x + box->xPos(), y + box->yPos(), box->width(), box->height()));
         else {
-            unsigned realEnd = min(box->len(), end);
+            unsigned realEnd = min(box->end(), end);
             IntRect r = box->selectionRect(x, y, start, realEnd);
             if (!r.isEmpty()) {