Changeset 88049 in webkit

Timestamp:

Jun 3, 2011 1:55:44 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintItemForeground and paintItemForeground to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62035

Switching paintItemFore/Background to use IntPoint instead of a pair of ints.

No new tests since this is simple refactoring.

• rendering/RenderListBox.cpp: (WebCore::RenderListBox::paintObject): (WebCore::RenderListBox::paintItemForeground): (WebCore::RenderListBox::paintItemBackground):
• rendering/RenderListBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderListBox.cpp (modified) (6 diffs)
• rendering/RenderListBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintItemForeground and paintItemForeground to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62035
+
+        Switching paintItemFore/Background to use IntPoint instead of a pair of ints.
+
+        No new tests since this is simple refactoring.
+
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::paintObject):
+        (WebCore::RenderListBox::paintItemForeground):
+        (WebCore::RenderListBox::paintItemBackground):
+        * rendering/RenderListBox.h:
+
 2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -267 +267 @@
         int index = m_indexOffset;
         while (index < listItemsSize && index <= m_indexOffset + numVisibleItems()) {
-            paintItemForeground(paintInfo, tx, ty, index);
+            paintItemForeground(paintInfo, IntPoint(tx, ty), index);
             index++;
         }
@@ -290 +290 @@
         int index = m_indexOffset;
         while (index < listItemsSize && index <= m_indexOffset + numVisibleItems()) {
-            paintItemBackground(paintInfo, tx, ty, index);
+            paintItemBackground(paintInfo, IntPoint(tx, ty), index);
             index++;
         }
@@ -357 +357 @@
 }
 
-void RenderListBox::paintItemForeground(PaintInfo& paintInfo, int tx, int ty, int listIndex)
+void RenderListBox::paintItemForeground(PaintInfo& paintInfo, const IntPoint& paintOffset, int listIndex)
 {
     SelectElement* select = toSelectElement(static_cast<Element*>(node()));
@@ -393 +393 @@
     TextRun textRun(string, length, false, 0, 0, TextRun::AllowTrailingExpansion, itemStyle->direction(), itemStyle->unicodeBidi() == Override);
     Font itemFont = style()->font();
-    IntRect r = itemBoundingBoxRect(IntPoint(tx, ty), listIndex);
+    IntRect r = itemBoundingBoxRect(paintOffset, listIndex);
     r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r));
 
@@ -408 +408 @@
 }
 
-void RenderListBox::paintItemBackground(PaintInfo& paintInfo, int tx, int ty, int listIndex)
+void RenderListBox::paintItemBackground(PaintInfo& paintInfo, const IntPoint& paintOffset, int listIndex)
 {
     SelectElement* select = toSelectElement(static_cast<Element*>(node()));
@@ -427 +427 @@
     if (!element->renderStyle() || element->renderStyle()->visibility() != HIDDEN) {
         ColorSpace colorSpace = element->renderStyle() ? element->renderStyle()->colorSpace() : style()->colorSpace();
-        IntRect itemRect = itemBoundingBoxRect(IntPoint(tx, ty), listIndex);
-        itemRect.intersect(controlClipRect(IntPoint(tx, ty)));
+        IntRect itemRect = itemBoundingBoxRect(paintOffset, listIndex);
+        itemRect.intersect(controlClipRect(paintOffset));
         paintInfo.context->fillRect(itemRect, backColor, colorSpace);
     }

trunk/Source/WebCore/rendering/RenderListBox.h

@@ -134 +134 @@
     int listHeight() const;
     void paintScrollbar(PaintInfo&, int tx, int ty);
-    void paintItemForeground(PaintInfo&, int tx, int ty, int listIndex);
-    void paintItemBackground(PaintInfo&, int tx, int ty, int listIndex);
+    void paintItemForeground(PaintInfo&, const IntPoint&, int listIndex);
+    void paintItemBackground(PaintInfo&, const IntPoint&, int listIndex);
     void scrollToRevealSelection();