Changeset 88190 in webkit

Timestamp:

Jun 6, 2011 2:35:56 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintOutline, paintContinuationOutlines, and paintOutlineForLine to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62137

Switching paintOutline, paintContinuationOutlines, and paintOutlineForLine to take an IntPoint
representing the paint offset instead of a pair of ints.

No new tests as this is simple refactoring.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintObject): (WebCore::RenderBlock::paintContinuationOutlines):
• rendering/RenderBlock.h:
• rendering/RenderInline.cpp: (WebCore::RenderInline::paintOutline): (WebCore::RenderInline::paintOutlineForLine):
• rendering/RenderInline.h:
• rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (4 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (7 diffs)
• rendering/RenderInline.h (modified) (2 diffs)
• rendering/RenderLineBoxList.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintOutline, paintContinuationOutlines, and paintOutlineForLine to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62137
+
+        Switching paintOutline, paintContinuationOutlines, and paintOutlineForLine to take an IntPoint
+        representing the paint offset instead of a pair of ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject):
+        (WebCore::RenderBlock::paintContinuationOutlines):
+        * rendering/RenderBlock.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::paintOutline):
+        (WebCore::RenderInline::paintOutlineForLine):
+        * rendering/RenderInline.h:
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::paint):
+
 2011-06-06  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2527 +2527 @@
                 cb->addContinuationWithOutline(inlineRenderer);
             else if (!inlineRenderer->firstLineBox())
-                inlineRenderer->paintOutline(paintInfo.context, paintOffset.x() - x() + inlineRenderer->containingBlock()->x(),
-                                             paintOffset.y() - y() + inlineRenderer->containingBlock()->y());
-        }
-        paintContinuationOutlines(paintInfo, paintOffset.x(), paintOffset.y());
+                inlineRenderer->paintOutline(paintInfo.context, paintOffset - locationOffset() + inlineRenderer->containingBlock()->location());
+        }
+        paintContinuationOutlines(paintInfo, paintOffset);
     }
 
@@ -2661 +2660 @@
 }
 
-void RenderBlock::paintContinuationOutlines(PaintInfo& info, int tx, int ty)
+void RenderBlock::paintContinuationOutlines(PaintInfo& info, const IntPoint& paintOffset)
 {
     ContinuationOutlineTableMap* table = continuationOutlineTable();
@@ -2670 +2669 @@
     if (!continuations)
         return;
-        
+
+    IntPoint accumulatedPaintOffset = paintOffset;
     // Paint each continuation outline.
     ListHashSet<RenderInline*>::iterator end = continuations->end();
@@ -2677 +2677 @@
         RenderInline* flow = *it;
         RenderBlock* block = flow->containingBlock();
-        for ( ; block && block != this; block = block->containingBlock()) {
-            tx += block->x();
-            ty += block->y();
-        }
+        for ( ; block && block != this; block = block->containingBlock())
+            accumulatedPaintOffset.move(block->location());
         ASSERT(block);   
-        flow->paintOutline(info.context, tx, ty);
+        flow->paintOutline(info.context, accumulatedPaintOffset);
     }
     

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -633 +633 @@
     void setDesiredColumnCountAndWidth(int count, int width);
 
-    void paintContinuationOutlines(PaintInfo&, int tx, int ty);
+    void paintContinuationOutlines(PaintInfo&, const IntPoint&);
 
     virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1367 +1367 @@
 }
 
-void RenderInline::paintOutline(GraphicsContext* graphicsContext, int tx, int ty)
+void RenderInline::paintOutline(GraphicsContext* graphicsContext, const IntPoint& paintOffset)
 {
     if (!hasOutline())
@@ -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, IntPoint(tx, ty), styleToUse);
+            paintFocusRing(graphicsContext, paintOffset, styleToUse);
         }
     }
@@ -1409 +1409 @@
 
     for (unsigned i = 1; i < rects.size() - 1; i++)
-        paintOutlineForLine(graphicsContext, tx, ty, rects.at(i - 1), rects.at(i), rects.at(i + 1), outlineColor);
+        paintOutlineForLine(graphicsContext, paintOffset, rects.at(i - 1), rects.at(i), rects.at(i + 1), outlineColor);
 
 // FIXME: Using a transparency layer for rgba outlines exacerbates an existing SKIA bug. The #if
@@ -1419 +1419 @@
 }
 
-void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, int tx, int ty,
+void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const IntPoint& paintOffset,
                                        const IntRect& lastline, const IntRect& thisline, const IntRect& nextline,
                                        const Color outlineColor)
@@ -1432 +1432 @@
     int offset = style()->outlineOffset();
 
-    int t = ty + thisline.y() - offset;
-    int l = tx + thisline.x() - offset;
-    int b = ty + thisline.maxY() + offset;
-    int r = tx + thisline.maxX() + offset;
+    int t = paintOffset.y() + thisline.y() - offset;
+    int l = paintOffset.x() + thisline.x() - offset;
+    int b = paintOffset.y() + thisline.maxY() + offset;
+    int r = paintOffset.x() + thisline.maxX() + offset;
     
     // left edge
@@ -1465 +1465 @@
                    l - ow,
                    t - ow,
-                   min(r+ow, (lastline.isEmpty() ? 1000000 : tx + lastline.x())),
+                   min(r+ow, (lastline.isEmpty() ? 1000000 : paintOffset.x() + lastline.x())),
                    t,
                    BSTop, outlineColor, os,
                    ow,
-                   (!lastline.isEmpty() && tx + lastline.x() + 1 < r + ow) ? -ow : ow,
+                   (!lastline.isEmpty() && paintOffset.x() + lastline.x() + 1 < r + ow) ? -ow : ow,
                    antialias);
     
     if (lastline.maxX() < thisline.maxX())
         drawLineForBoxSide(graphicsContext,
-                   max(lastline.isEmpty() ? -1000000 : tx + lastline.maxX(), l - ow),
+                   max(lastline.isEmpty() ? -1000000 : paintOffset.x() + lastline.maxX(), l - ow),
                    t - ow,
                    r + ow,
                    t,
                    BSTop, outlineColor, os,
-                   (!lastline.isEmpty() && l - ow < tx + lastline.maxX()) ? -ow : ow,
+                   (!lastline.isEmpty() && l - ow < paintOffset.x() + lastline.maxX()) ? -ow : ow,
                    ow, antialias);
     
@@ -1487 +1487 @@
                    l - ow,
                    b,
-                   min(r + ow, !nextline.isEmpty() ? tx + nextline.x() + 1 : 1000000),
+                   min(r + ow, !nextline.isEmpty() ? paintOffset.x() + nextline.x() + 1 : 1000000),
                    b + ow,
                    BSBottom, outlineColor, os,
                    ow,
-                   (!nextline.isEmpty() && tx + nextline.x() + 1 < r + ow) ? -ow : ow,
+                   (!nextline.isEmpty() && paintOffset.x() + nextline.x() + 1 < r + ow) ? -ow : ow,
                    antialias);
     
     if (nextline.maxX() < thisline.maxX())
         drawLineForBoxSide(graphicsContext,
-                   max(!nextline.isEmpty() ? tx + nextline.maxX() : -1000000, l - ow),
+                   max(!nextline.isEmpty() ? paintOffset.x() + nextline.maxX() : -1000000, l - ow),
                    b,
                    r + ow,
                    b + ow,
                    BSBottom, outlineColor, os,
-                   (!nextline.isEmpty() && l - ow < tx + nextline.maxX()) ? -ow : ow,
+                   (!nextline.isEmpty() && l - ow < paintOffset.x() + nextline.maxX()) ? -ow : ow,
                    ow, antialias);
 }

trunk/Source/WebCore/rendering/RenderInline.h

@@ -77 +77 @@
 
     virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
-    void paintOutline(GraphicsContext*, int tx, int ty);
+    void paintOutline(GraphicsContext*, const IntPoint&);
 
     using RenderBoxModelObject::continuation;
@@ -163 +163 @@
     static RenderInline* cloneInline(RenderInline* src);
 
-    void paintOutlineForLine(GraphicsContext*, int tx, int ty, const IntRect& prevLine, const IntRect& thisLine,
+    void paintOutlineForLine(GraphicsContext*, const IntPoint&, const IntRect& prevLine, const IntRect& thisLine,
                              const IntRect& nextLine, const Color);
     RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);

trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

@@ -268 +268 @@
         for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects->begin(); it != end; ++it) {
             RenderInline* flow = *it;
-            flow->paintOutline(info.context, tx, ty);
+            flow->paintOutline(info.context, IntPoint(tx, ty));
         }
         info.outlineObjects->clear();