Changeset 88188 in webkit

Timestamp:

Jun 6, 2011 2:26:24 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-06-06 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Remove tx/ty offset from selectionRect
​https://bugs.webkit.org/show_bug.cgi?id=62146

Removing unused offset parameters from selectionRect.

No new tests since this is just cleanup.

• rendering/EllipsisBox.cpp: (WebCore::EllipsisBox::selectionRect):
• rendering/EllipsisBox.h:
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::selectionRect):
• rendering/InlineTextBox.h:
• rendering/RenderText.cpp: (WebCore::RenderText::absoluteRectsForRange): (WebCore::ellipsisRectForBox): (WebCore::RenderText::absoluteQuadsForRange): (WebCore::RenderText::selectionRectForRepaint):
• rendering/svg/RenderSVGInlineText.cpp: (WebCore::RenderSVGInlineText::localCaretRect):
• rendering/svg/SVGInlineTextBox.cpp: (WebCore::SVGInlineTextBox::selectionRect):
• rendering/svg/SVGInlineTextBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/EllipsisBox.cpp (modified) (1 diff)
• rendering/EllipsisBox.h (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (2 diffs)
• 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-06-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove tx/ty offset from selectionRect
+        https://bugs.webkit.org/show_bug.cgi?id=62146
+
+        Removing unused offset parameters from selectionRect.
+
+        No new tests since this is just cleanup.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::selectionRect):
+        * rendering/EllipsisBox.h:
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::selectionRect):
+        * rendering/InlineTextBox.h:
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::absoluteRectsForRange):
+        (WebCore::ellipsisRectForBox):
+        (WebCore::RenderText::absoluteQuadsForRange):
+        (WebCore::RenderText::selectionRectForRepaint):
+        * rendering/svg/RenderSVGInlineText.cpp:
+        (WebCore::RenderSVGInlineText::localCaretRect):
+        * rendering/svg/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::selectionRect):
+        * rendering/svg/SVGInlineTextBox.h:
+
 2011-06-06  Paul Kinlan  <paulkinlan@google.com>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -74 +74 @@
 }
 
-IntRect EllipsisBox::selectionRect(int tx, int ty)
+IntRect EllipsisBox::selectionRect()
 {
     RenderStyle* style = m_renderer->style(m_firstLine);
     const Font& font = style->font();
     // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
-    return enclosingIntRect(font.selectionRectForText(RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(x() + tx, y() + ty + root()->selectionTop()), root()->selectionHeight()));
+    return enclosingIntRect(font.selectionRectForText(RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(x(), y() + root()->selectionTop()), root()->selectionHeight()));
 }
 

trunk/Source/WebCore/rendering/EllipsisBox.h

@@ -43 +43 @@
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, int lineTop, int lineBottom);
     void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
-    IntRect selectionRect(int tx, int ty);
+    IntRect selectionRect();
 
 private:

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -173 +173 @@
 }
 
-IntRect InlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos)
+IntRect InlineTextBox::selectionRect(int startPos, int endPos)
 {
     int sPos = max(startPos - m_start, 0);
@@ -201 +201 @@
         logicalWidth = logicalRight() - r.x();
 
-    IntPoint topPoint = isHorizontal() ? IntPoint(r.x(), ty + selTop) : IntPoint(tx + selTop, r.x());
+    IntPoint topPoint = isHorizontal() ? IntPoint(r.x(), selTop) : IntPoint(selTop, r.x());
     int width = isHorizontal() ? logicalWidth : selHeight;
     int height = isHorizontal() ? selHeight : logicalWidth;

trunk/Source/WebCore/rendering/InlineTextBox.h

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

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -293 +293 @@
             IntRect r = box->calculateBoundaries();
             if (useSelectionHeight) {
-                IntRect selectionRect = box->selectionRect(0, 0, start, end);
+                IntRect selectionRect = box->selectionRect(start, end);
                 if (box->isHorizontal()) {
                     r.setHeight(selectionRect.height());
@@ -305 +305 @@
         } else {
             unsigned realEnd = min(box->end() + 1, end);
-            IntRect r = box->selectionRect(0, 0, start, realEnd);
+            IntRect r = box->selectionRect(start, realEnd);
             if (!r.isEmpty()) {
                 if (!useSelectionHeight) {
@@ -341 +341 @@
         // beginning of the selection is before or at the beginning of the truncation.
         if (ellipsisEndPosition >= truncation && ellipsisStartPosition <= truncation)
-            return ellipsis->selectionRect(0, 0);
+            return ellipsis->selectionRect();
     }
     
@@ -386 +386 @@
             IntRect r(box->calculateBoundaries());
             if (useSelectionHeight) {
-                IntRect selectionRect = box->selectionRect(0, 0, start, end);
+                IntRect selectionRect = box->selectionRect(start, end);
                 if (box->isHorizontal()) {
                     r.setHeight(selectionRect.height());
@@ -398 +398 @@
         } else {
             unsigned realEnd = min(box->end() + 1, end);
-            IntRect r = box->selectionRect(0, 0, start, realEnd);
+            IntRect r = box->selectionRect(start, realEnd);
             if (r.height()) {
                 if (!useSelectionHeight) {
@@ -1398 +1398 @@
     IntRect rect;
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
-        rect.unite(box->selectionRect(0, 0, startPos, endPos));
+        rect.unite(box->selectionRect(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(0, 0, caretOffset, caretOffset + 1);
+        IntRect rect = textBox->selectionRect(caretOffset, caretOffset + 1);
         int x = box->isLeftToRightDirection() ? rect.x() : rect.maxX();
         return IntRect(x, rect.y(), caretWidth, rect.height());
     }
 
-    IntRect rect = textBox->selectionRect(0, 0, caretOffset - 1, caretOffset);
+    IntRect rect = textBox->selectionRect(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

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

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

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