Changeset 88200 in webkit

Timestamp:

Jun 6, 2011 4:21:20 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch shouldPaint to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62158

Switching shouldPaint to take an IntPoint representing the paint offset instead
of a pair of ints.

No new tests as this is simple refactoring.

• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::paint): (WebCore::RenderReplaced::shouldPaint):
• rendering/RenderReplaced.h:
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (4 diffs)
• rendering/RenderReplaced.h (modified) (1 diff)
• rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch shouldPaint to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62158
+
+        Switching shouldPaint to take an IntPoint representing the paint offset instead
+        of a pair of ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::paint):
+        (WebCore::RenderReplaced::shouldPaint):
+        * rendering/RenderReplaced.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::paint):
+
 2011-06-06  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -97 +97 @@
 void RenderReplaced::paint(PaintInfo& paintInfo, int tx, int ty)
 {
-    if (!shouldPaint(paintInfo, tx, ty))
+    if (!shouldPaint(paintInfo, IntPoint(tx, ty)))
         return;
     
@@ -157 +157 @@
 }
 
-bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, int& tx, int& ty)
+bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseOutline && paintInfo.phase != PaintPhaseSelfOutline 
@@ -170 +170 @@
         return false;
 
-    int currentTX = tx + x();
-    int currentTY = ty + y();
+    IntPoint adjustedPaintOffset = paintOffset + location();
 
     // Early exit if the element touches the edges.
-    int top = currentTY + minYVisualOverflow();
-    int bottom = currentTY + maxYVisualOverflow();
+    int top = adjustedPaintOffset.y() + minYVisualOverflow();
+    int bottom = adjustedPaintOffset.y() + maxYVisualOverflow();
     if (isSelected() && m_inlineBoxWrapper) {
-        int selTop = ty + m_inlineBoxWrapper->root()->selectionTop();
-        int selBottom = ty + selTop + m_inlineBoxWrapper->root()->selectionHeight();
+        int selTop = paintOffset.y() + m_inlineBoxWrapper->root()->selectionTop();
+        int selBottom = paintOffset.y() + selTop + m_inlineBoxWrapper->root()->selectionHeight();
         top = min(selTop, top);
         bottom = max(selBottom, bottom);
@@ -184 +183 @@
     
     int os = 2 * maximalOutlineSize(paintInfo.phase);
-    if (currentTX + minXVisualOverflow() >= paintInfo.rect.maxX() + os || currentTX + maxXVisualOverflow() <= paintInfo.rect.x() - os)
+    if (adjustedPaintOffset.x() + minXVisualOverflow() >= paintInfo.rect.maxX() + os || adjustedPaintOffset.x() + maxXVisualOverflow() <= paintInfo.rect.x() - os)
         return false;
     if (top >= paintInfo.rect.maxY() + os || bottom <= paintInfo.rect.y() - os)

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -53 +53 @@
 
     virtual void paint(PaintInfo&, int tx, int ty);
-    bool shouldPaint(PaintInfo&, int& tx, int& ty);
+    bool shouldPaint(PaintInfo&, const IntPoint&);
     IntRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
 

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -250 +250 @@
 void RenderWidget::paint(PaintInfo& paintInfo, int tx, int ty)
 {
-    if (!shouldPaint(paintInfo, tx, ty))
+    if (!shouldPaint(paintInfo, IntPoint(tx, ty)))
         return;