Changeset 88051 in webkit

Timestamp:

Jun 3, 2011 1:59:40 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

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

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

No new tests as this is simple refactoring.

• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::paintBackgroundsBehindCell): (WebCore::RenderTableCell::paintBoxDecorations):
• rendering/RenderTableCell.h:
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::paint):
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::paintCell):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (4 diffs)
• rendering/RenderTableCell.h (modified) (1 diff)
• rendering/RenderTableRow.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintBackgroundsBehindCell to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62031
+
+        Switching paintBackgroundsBehindCell to take an IntPoint representing
+        the paint offset instead of a pair of ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintBackgroundsBehindCell):
+        (WebCore::RenderTableCell::paintBoxDecorations):
+        * rendering/RenderTableCell.h:
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::paint):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::paintCell):
+
 2011-06-03  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -962 +962 @@
 }
 
-void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, int tx, int ty, RenderObject* backgroundObject)
+void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const IntPoint& paintOffset, RenderObject* backgroundObject)
 {
     if (!paintInfo.shouldPaintWithinRoot(this))
@@ -977 +977 @@
         return;
 
-    if (backgroundObject != this) {
-        tx += x();
-        ty += y();
-    }
-
-    int w = width();
-    int h = height();
+    IntPoint adjustedPaintOffset = paintOffset;
+    if (backgroundObject != this)
+        adjustedPaintOffset.move(location());
 
     Color c = backgroundObject->style()->visitedDependentColor(CSSPropertyBackgroundColor);
@@ -994 +990 @@
         GraphicsContextStateSaver stateSaver(*paintInfo.context, shouldClip);
         if (shouldClip) {
-            IntRect clipRect(tx + borderLeft(), ty + borderTop(),
-                w - borderLeft() - borderRight(), h - borderTop() - borderBottom());
+            IntRect clipRect(adjustedPaintOffset.x() + borderLeft(), adjustedPaintOffset.y() + borderTop(),
+                width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
             paintInfo.context->clip(clipRect);
         }
-        paintFillLayers(paintInfo, c, bgLayer, IntRect(tx, ty, w, h), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
+        paintFillLayers(paintInfo, c, bgLayer, IntRect(adjustedPaintOffset, size()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
     }
 }
@@ -1015 +1011 @@
     
     // Paint our cell background.
-    paintBackgroundsBehindCell(paintInfo, paintOffset.x(), paintOffset.y(), this);
+    paintBackgroundsBehindCell(paintInfo, paintOffset, this);
 
     paintBoxShadow(paintInfo.context, paintRect, style(), Inset);

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -97 +97 @@
     virtual void paint(PaintInfo&, int tx, int ty);
 
-    void paintBackgroundsBehindCell(PaintInfo&, int tx, int ty, RenderObject* backgroundObject);
+    void paintBackgroundsBehindCell(PaintInfo&, const IntPoint&, RenderObject* backgroundObject);
 
     int cellBaselinePosition() const;

trunk/Source/WebCore/rendering/RenderTableRow.cpp

@@ -219 +219 @@
             if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseChildBlockBackground) {
                 RenderTableCell* cell = toRenderTableCell(child);
-                cell->paintBackgroundsBehindCell(paintInfo, tx, ty, this);
+                cell->paintBackgroundsBehindCell(paintInfo, IntPoint(tx, ty), this);
             }
             if (!toRenderBox(child)->hasSelfPaintingLayer())

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -934 +934 @@
         // Note that we deliberately ignore whether or not the cell has a layer, since these backgrounds paint "behind" the
         // cell.
-        cell->paintBackgroundsBehindCell(paintInfo, cellPoint.x(), cellPoint.y(), colGroup);
-        cell->paintBackgroundsBehindCell(paintInfo, cellPoint.x(), cellPoint.y(), col);
+        cell->paintBackgroundsBehindCell(paintInfo, cellPoint, colGroup);
+        cell->paintBackgroundsBehindCell(paintInfo, cellPoint, col);
 
         // Paint the row group next.
-        cell->paintBackgroundsBehindCell(paintInfo, cellPoint.x(), cellPoint.y(), this);
+        cell->paintBackgroundsBehindCell(paintInfo, cellPoint, this);
 
         // Paint the row next, but only if it doesn't have a layer.  If a row has a layer, it will be responsible for
         // painting the row background for the cell.
         if (!row->hasSelfPaintingLayer())
-            cell->paintBackgroundsBehindCell(paintInfo, cellPoint.x(), cellPoint.y(), row);
+            cell->paintBackgroundsBehindCell(paintInfo, cellPoint, row);
     }
     if ((!cell->hasSelfPaintingLayer() && !row->hasSelfPaintingLayer()) || paintInfo.phase == PaintPhaseCollapsedTableBorders)