Changeset 86385 in webkit

Timestamp:

May 12, 2011 3:15:26 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintBoxDecorationWithSize to IntRect
​https://bugs.webkit.org/show_bug.cgi?id=60679

Switching paintBoxDecorationWithSize to take an IntRect instead of 4 ints.

No new tests as this is simple refactoring.

• rendering/RenderBox.cpp: (WebCore::RenderBox::paintBoxDecorations): Cleaning up amazingly confusing logic. (WebCore::RenderBox::paintBoxDecorationsWithSize):
• rendering/RenderBox.h:
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::paintBoxDecorations):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-12  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintBoxDecorationWithSize to IntRect
+        https://bugs.webkit.org/show_bug.cgi?id=60679
+
+        Switching paintBoxDecorationWithSize to take an IntRect instead of 4 ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBoxDecorations): Cleaning up amazingly confusing logic.
+        (WebCore::RenderBox::paintBoxDecorationsWithSize):
+        * rendering/RenderBox.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::paintBoxDecorations):
+
 2011-05-12  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -805 +805 @@
 void RenderBox::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty)
 {
-    if (!paintInfo.shouldPaintWithinRoot(this))
-        return;
-    return paintBoxDecorationsWithSize(paintInfo, tx, ty, width(), height());
+    if (paintInfo.shouldPaintWithinRoot(this))
+        paintBoxDecorationsWithSize(paintInfo, IntRect(tx, ty, width(), height()));
 }
 
@@ -833 +832 @@
 }
 
-void RenderBox::paintBoxDecorationsWithSize(PaintInfo& paintInfo, int tx, int ty, int width, int height)
-{
-    IntRect paintRect = IntRect(tx, ty, width, height);
+void RenderBox::paintBoxDecorationsWithSize(PaintInfo& paintInfo, IntRect paintRect)
+{
     // border-fit can adjust where we paint our border and background.  If set, we snugly fit our line box descendants.  (The iChat
     // balloon layout is an example of this).

trunk/Source/WebCore/rendering/RenderBox.h

@@ -409 +409 @@
     void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, BackgroundBleedAvoidance = BackgroundBleedNone, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
 
-    void paintBoxDecorationsWithSize(PaintInfo&, int tx, int ty, int width, int height);
+    void paintBoxDecorationsWithSize(PaintInfo&, IntRect);
     void paintMaskImages(const PaintInfo&, const IntRect&);
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -234 +234 @@
 void RenderTextControlSingleLine::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty)
 {
-    paintBoxDecorationsWithSize(paintInfo, tx, ty, width() - decorationWidthRight(), height());
+    paintBoxDecorationsWithSize(paintInfo, IntRect(tx, ty, width() - decorationWidthRight(), height()));
 }