Changeset 92625 in webkit

Timestamp:

Aug 8, 2011 1:11:22 PM (13 years ago)

Author:

eae@chromium.org

Message:

Rename absoluteQuadsForRange and InlineTextBox::selectionRect to local*
​https://bugs.webkit.org/show_bug.cgi?id=65722

Reviewed by Simon Fraser.

No new tests, no new functionality.

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::localSelectionRect):
Rename InlineTextBox::selectionRect to localSelectionRect to reflect that
it, unlike RenderObject::selectionRect returns a rect in the local
coordinate space.

• rendering/InlineTextBox.h:
• rendering/RenderText.cpp:

(WebCore::localQuadForTextBox):
(WebCore::RenderText::absoluteRectsForRange):
(WebCore::RenderText::absoluteQuadsForRange):
(WebCore::RenderText::selectionRectForRepaint):
Rename absoluteQuadForTextBox to localQuadForTextBox to reflect that it
returns a quad in the local coordinate space.

• rendering/svg/RenderSVGInlineText.cpp:

(WebCore::RenderSVGInlineText::localCaretRect):

• rendering/svg/SVGInlineTextBox.cpp:

(WebCore::SVGInlineTextBox::localSelectionRect):

• rendering/svg/SVGInlineTextBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/InlineTextBox.h (modified) (1 diff)
• rendering/RenderText.cpp (modified) (6 diffs)
• rendering/svg/RenderSVGInlineText.cpp (modified) (1 diff)
• rendering/svg/SVGInlineTextBox.cpp (modified) (1 diff)
• rendering/svg/SVGInlineTextBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-08  Emil A Eklund  <eae@chromium.org>
+
+        Rename absoluteQuadsForRange and InlineTextBox::selectionRect to local*
+        https://bugs.webkit.org/show_bug.cgi?id=65722
+
+        Reviewed by Simon Fraser.
+
+        No new tests, no new functionality.
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::localSelectionRect):
+        Rename InlineTextBox::selectionRect to localSelectionRect to reflect that
+        it, unlike RenderObject::selectionRect returns a rect in the local
+        coordinate space.
+
+        * rendering/InlineTextBox.h:
+        * rendering/RenderText.cpp:
+        (WebCore::localQuadForTextBox):
+        (WebCore::RenderText::absoluteRectsForRange):
+        (WebCore::RenderText::absoluteQuadsForRange):
+        (WebCore::RenderText::selectionRectForRepaint):
+        Rename absoluteQuadForTextBox to localQuadForTextBox to reflect that it
+        returns a quad in the local coordinate space.
+        
+        * rendering/svg/RenderSVGInlineText.cpp:
+        (WebCore::RenderSVGInlineText::localCaretRect):
+        * rendering/svg/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::localSelectionRect):
+        * rendering/svg/SVGInlineTextBox.h:
+
 2011-08-08  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -174 +174 @@
 }
 
-IntRect InlineTextBox::selectionRect(int startPos, int endPos)
+IntRect InlineTextBox::localSelectionRect(int startPos, int endPos)
 {
     int sPos = max(startPos - m_start, 0);

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -106 +106 @@
     virtual IntRect calculateBoundaries() const { return IntRect(x(), y(), width(), height()); }
 
-    virtual IntRect selectionRect(int startPos, int endPos);
+    virtual IntRect localSelectionRect(int startPos, int endPos);
     bool isSelected(int startPos, int endPos) const;
     void selectionStartEnd(int& sPos, int& ePos);

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -273 +273 @@
 }
 
-static FloatRect absoluteQuadForTextBox(InlineTextBox* box, unsigned start, unsigned end, bool useSelectionHeight)
+static FloatRect localQuadForTextBox(InlineTextBox* box, unsigned start, unsigned end, bool useSelectionHeight)
 {
     unsigned realEnd = min(box->end() + 1, end);
-    IntRect r = box->selectionRect(start, realEnd);
+    IntRect r = box->localSelectionRect(start, realEnd);
     if (r.height()) {
         if (!useSelectionHeight) {
@@ -311 +311 @@
             IntRect r = box->calculateBoundaries();
             if (useSelectionHeight) {
-                IntRect selectionRect = box->selectionRect(start, end);
+                IntRect selectionRect = box->localSelectionRect(start, end);
                 if (box->isHorizontal()) {
                     r.setHeight(selectionRect.height());
@@ -323 +323 @@
         } else {
             // FIXME: This code is wrong. It's converting local to absolute twice. http://webkit.org/b/65722
-            FloatRect rect = absoluteQuadForTextBox(box, start, end, useSelectionHeight);
+            FloatRect rect = localQuadForTextBox(box, start, end, useSelectionHeight);
             if (!rect.isZero())
                 rects.append(localToAbsoluteQuad(rect, false, wasFixed).enclosingBoundingBox());
@@ -393 +393 @@
             IntRect r(box->calculateBoundaries());
             if (useSelectionHeight) {
-                IntRect selectionRect = box->selectionRect(start, end);
+                IntRect selectionRect = box->localSelectionRect(start, end);
                 if (box->isHorizontal()) {
                     r.setHeight(selectionRect.height());
@@ -404 +404 @@
             quads.append(localToAbsoluteQuad(FloatRect(r), false, wasFixed));
         } else {
-            FloatRect rect = absoluteQuadForTextBox(box, start, end, useSelectionHeight);
+            FloatRect rect = localQuadForTextBox(box, start, end, useSelectionHeight);
             if (!rect.isZero())
                 quads.append(localToAbsoluteQuad(rect, false, wasFixed));
@@ -1407 +1407 @@
     LayoutRect rect;
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
-        rect.unite(box->selectionRect(startPos, endPos));
+        rect.unite(box->localSelectionRect(startPos, endPos));
         rect.unite(ellipsisRectForBox(box, startPos, endPos));
     }

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp

@@ -118 +118 @@
     // Use the edge of the selection rect to determine the caret rect.
     if (static_cast<unsigned>(caretOffset) < textBox->start() + textBox->len()) {
-        IntRect rect = textBox->selectionRect(caretOffset, caretOffset + 1);
+        IntRect rect = textBox->localSelectionRect(caretOffset, caretOffset + 1);
         int x = box->isLeftToRightDirection() ? rect.x() : rect.maxX();
         return IntRect(x, rect.y(), caretWidth, rect.height());
     }
 
-    IntRect rect = textBox->selectionRect(caretOffset - 1, caretOffset);
+    IntRect rect = textBox->localSelectionRect(caretOffset - 1, caretOffset);
     int x = box->isLeftToRightDirection() ? rect.maxX() : rect.x();
     return IntRect(x, rect.y(), caretWidth, rect.height());

trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp

@@ -118 +118 @@
 }
 
-IntRect SVGInlineTextBox::selectionRect(int startPosition, int endPosition)
+IntRect SVGInlineTextBox::localSelectionRect(int startPosition, int endPosition)
 {
     int boxStart = start();

trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h

@@ -48 +48 @@
     void paintSelectionBackground(PaintInfo&);
     virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
-    virtual IntRect selectionRect(int startPosition, int endPosition);
+    virtual IntRect localSelectionRect(int startPosition, int endPosition);
 
     bool mapStartEndPositionsIntoFragmentCoordinates(const SVGTextFragment&, int& startPosition, int& endPosition) const;