Changeset 87738 in webkit

Timestamp:

May 31, 2011 10:12:39 AM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintFocusRing to IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61580

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

No new tests as this is just refactoring.

• rendering/RenderInline.cpp: (WebCore::RenderInline::paintOutline):
• rendering/RenderObject.cpp: (WebCore::RenderObject::paintFocusRing): (WebCore::RenderObject::paintOutline):
• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-31  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintFocusRing to IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61580
+
+        Switching paintFocusRing to take an IntPoint representing the paint offset
+        instead of a pair of ints.
+
+        No new tests as this is just refactoring.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::paintOutline):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::paintFocusRing):
+        (WebCore::RenderObject::paintOutline):
+        * rendering/RenderObject.h:
+
 2011-05-31  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1376 +1376 @@
         if (!theme()->supportsFocusRing(styleToUse)) {
             // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
-            paintFocusRing(graphicsContext, tx, ty, styleToUse);
+            paintFocusRing(graphicsContext, IntPoint(tx, ty), styleToUse);
         }
     }

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -998 +998 @@
 #endif
     
-void RenderObject::paintFocusRing(GraphicsContext* context, int tx, int ty, RenderStyle* style)
+void RenderObject::paintFocusRing(GraphicsContext* context, const IntPoint& paintOffset, RenderStyle* style)
 {
     Vector<IntRect> focusRingRects;
-    addFocusRingRects(focusRingRects, IntPoint(tx, ty));
+    addFocusRingRects(focusRingRects, paintOffset);
     if (style->outlineStyleIsAuto())
         context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), style->visitedDependentColor(CSSPropertyOutlineColor));
@@ -1037 +1037 @@
         if (!theme()->supportsFocusRing(styleToUse)) {
             // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
-            paintFocusRing(graphicsContext, paintRect.x(), paintRect.y(), styleToUse);
+            paintFocusRing(graphicsContext, paintRect.location(), styleToUse);
         }
     }

trunk/Source/WebCore/rendering/RenderObject.h

@@ -792 +792 @@
                             Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false);
 
-    void paintFocusRing(GraphicsContext*, int tx, int ty, RenderStyle*);
+    void paintFocusRing(GraphicsContext*, const IntPoint&, RenderStyle*);
     void paintOutline(GraphicsContext*, const IntRect&);
     void addPDFURLRect(GraphicsContext*, const IntRect&);