Changeset 87841 in webkit


Ignore:
Timestamp:
Jun 1, 2011 1:38:14 PM (13 years ago)
Author:
leviw@chromium.org
Message:

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

Reviewed by Eric Seidel.

Switch paintScrollCorner to use IntPoint
https://bugs.webkit.org/show_bug.cgi?id=61874

Changing paintScrollCorner to take an IntPoint representing the paint
offset instead of a pair of ints.

No new tests as this is simple refactoring.

  • rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintOverflowControls): (WebCore::RenderLayer::paintScrollCorner):
  • rendering/RenderLayer.h:
  • rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents):
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87837 r87841  
     12011-06-01  Levi Weintraub  <leviw@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Switch paintScrollCorner to use IntPoint
     6        https://bugs.webkit.org/show_bug.cgi?id=61874
     7
     8        Changing paintScrollCorner to take an IntPoint representing the paint
     9        offset instead of a pair of ints.
     10
     11        No new tests as this is simple refactoring.
     12
     13        * rendering/RenderLayer.cpp:
     14        (WebCore::RenderLayer::paintOverflowControls):
     15        (WebCore::RenderLayer::paintScrollCorner):
     16        * rendering/RenderLayer.h:
     17        * rendering/RenderLayerBacking.cpp:
     18        (WebCore::RenderLayerBacking::paintContents):
     19
    1202011-06-01  Kenneth Russell  <kbr@google.com>
    221
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r87467 r87841  
    23242324    // We fill our scroll corner with white if we have a scrollbar that doesn't run all the way up to the
    23252325    // edge of the box.
    2326     paintScrollCorner(context, offsetX, offsetY, damageRect);
     2326    paintScrollCorner(context, IntPoint(offsetX, offsetY), damageRect);
    23272327   
    23282328    // Paint our resizer last, since it sits on top of the scroll corner.
     
    23302330}
    23312331
    2332 void RenderLayer::paintScrollCorner(GraphicsContext* context, int tx, int ty, const IntRect& damageRect)
     2332void RenderLayer::paintScrollCorner(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)
    23332333{
    23342334    RenderBox* box = renderBox();
    23352335    ASSERT(box);
    23362336
    2337     IntRect cornerRect = scrollCornerRect();
    2338     IntRect absRect = IntRect(cornerRect.x() + tx, cornerRect.y() + ty, cornerRect.width(), cornerRect.height());
     2337    IntRect absRect = scrollCornerRect();
     2338    absRect.move(paintOffset);
    23392339    if (!absRect.intersects(damageRect))
    23402340        return;
     
    23462346
    23472347    if (m_scrollCorner) {
    2348         m_scrollCorner->paintIntoRect(context, tx, ty, absRect);
     2348        m_scrollCorner->paintIntoRect(context, paintOffset.x(), paintOffset.y(), absRect);
    23492349        return;
    23502350    }
  • trunk/Source/WebCore/rendering/RenderLayer.h

    r87467 r87841  
    263263
    264264    void paintOverflowControls(GraphicsContext*, int tx, int ty, const IntRect& damageRect, bool paintingOverlayControls = false);
    265     void paintScrollCorner(GraphicsContext*, int tx, int ty, const IntRect& damageRect);
     265    void paintScrollCorner(GraphicsContext*, const IntPoint&, const IntRect& damageRect);
    266266    void paintResizer(GraphicsContext*, int tx, int ty, const IntRect& damageRect);
    267267
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r87303 r87841  
    12371237        IntRect transformedClip = clip;
    12381238        transformedClip.move(scrollCornerAndResizer.location());
    1239         m_owningLayer->paintScrollCorner(&context, 0, 0, transformedClip);
     1239        m_owningLayer->paintScrollCorner(&context, IntPoint(), transformedClip);
    12401240        m_owningLayer->paintResizer(&context, 0, 0, transformedClip);
    12411241        context.restore();
Note: See TracChangeset for help on using the changeset viewer.