Changeset 163931 in webkit


Ignore:
Timestamp:
Feb 11, 2014 7:28:43 PM (10 years ago)
Author:
Alan Bujtas
Message:

Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
​https://bugs.webkit.org/show_bug.cgi?id=128460

Reviewed by Simon Fraser.

GraphicsClient::paintContents takes clipRect as FloatRect now so that we can paint on
subpixel position.

No change in functionality.

Source/WebCore:

  • platform/graphics/GraphicsLayerClient.h:
  • platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:

(WebCore::CompositingCoordinator::paintContents):

  • platform/graphics/texmap/coordinated/CompositingCoordinator.h:
  • rendering/RenderLayer.cpp:

(WebCore::cornerRect):
(WebCore::RenderLayer::scrollCornerRect):
(WebCore::resizerCornerRect):
(WebCore::RenderLayer::scrollCornerAndResizerRect):
(WebCore::RenderLayer::verticalScrollbarStart):
(WebCore::RenderLayer::horizontalScrollbarStart):
(WebCore::RenderLayer::paintResizer):
(WebCore::RenderLayer::hitTestOverflowControls):

  • rendering/RenderLayer.h:
  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintIntoLayer):
(WebCore::RenderLayerBacking::paintContents):

  • rendering/RenderLayerBacking.h:
  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::paintContents):

  • rendering/RenderLayerCompositor.h:
  • rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paint):

Source/WebKit/gtk:

  • WebCoreSupport/AcceleratedCompositingContext.h:
  • WebCoreSupport/AcceleratedCompositingContextGL.cpp:

(WebKit::AcceleratedCompositingContext::paintContents):

Source/WebKit/win:

  • WebView.cpp:

(WebView::paintContents):

  • WebView.h:

Source/WebKit2:

  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::paintContents):

  • WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::paintContents):

  • WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
  • WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::paintContents):

Location:
trunk/Source
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r163928 r163931  
     12014-02-11  Zalan Bujtas  <zalan@apple.com>
     2
     3        Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
     4        https://bugs.webkit.org/show_bug.cgi?id=128460
     5
     6        Reviewed by Simon Fraser.
     7
     8        GraphicsClient::paintContents takes clipRect as FloatRect now so that we can paint on
     9        subpixel position.
     10
     11        No change in functionality.
     12
     13        * platform/graphics/GraphicsLayerClient.h:
     14        * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
     15        (WebCore::CompositingCoordinator::paintContents):
     16        * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
     17        * rendering/RenderLayer.cpp:
     18        (WebCore::cornerRect):
     19        (WebCore::RenderLayer::scrollCornerRect):
     20        (WebCore::resizerCornerRect):
     21        (WebCore::RenderLayer::scrollCornerAndResizerRect):
     22        (WebCore::RenderLayer::verticalScrollbarStart):
     23        (WebCore::RenderLayer::horizontalScrollbarStart):
     24        (WebCore::RenderLayer::paintResizer):
     25        (WebCore::RenderLayer::hitTestOverflowControls):
     26        * rendering/RenderLayer.h:
     27        * rendering/RenderLayerBacking.cpp:
     28        (WebCore::RenderLayerBacking::paintIntoLayer):
     29        (WebCore::RenderLayerBacking::paintContents):
     30        * rendering/RenderLayerBacking.h:
     31        * rendering/RenderLayerCompositor.cpp:
     32        (WebCore::RenderLayerCompositor::paintContents):
     33        * rendering/RenderLayerCompositor.h:
     34        * rendering/RenderWidget.cpp:
     35        (WebCore::RenderWidget::paint):
     36
    1372014-02-11  Antti Koivisto  <antti@apple.com>
    238

  • trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h

    r163104 r163931  
    3030
    3131class FloatPoint;
     32class FloatRect;
    3233class GraphicsContext;
    3334class GraphicsLayer;
    … …  
    7172    virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) { }
    7273
    73     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) = 0;
     74    virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& inClip) = 0;
    7475    virtual void didCommitChangesForLayer(const GraphicsLayer*) const { }
    7576

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp

    r162644 r163931  
    254254
    255255
    256 void CompositingCoordinator::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
    257 {
    258     m_client->paintLayerContents(graphicsLayer, graphicsContext, clipRect);
     256void CompositingCoordinator::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
     257{
     258    m_client->paintLayerContents(graphicsLayer, graphicsContext, enclosingIntRect(clipRect));
    259259}
    260260

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h

    r162644 r163931  
    9292    virtual void notifyAnimationStarted(const GraphicsLayer*, double time) override;
    9393    virtual void notifyFlushRequired(const GraphicsLayer*) override;
    94     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& clipRect) override;
     94    virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& clipRect) override;
    9595    virtual float deviceScaleFactor() const override;
    9696    virtual float pageScaleFactor() const override;

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r163873 r163931  
    27002700    RenderBox* box = renderBox();
    27012701    if (!box)
    2702         return IntRect();
     2702        return LayoutRect();
    27032703    LayoutRect scrollCornerAndResizer = scrollCornerRect();
    27042704    if (scrollCornerAndResizer.isEmpty())

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r163725 r163931  
    21282128
    21292129void RenderLayerBacking::paintIntoLayer(const GraphicsLayer* graphicsLayer, GraphicsContext* context,
    2130                     const IntRect& paintDirtyRect, // In the coords of rootLayer.
    2131                     PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
     2130    const LayoutRect& paintDirtyRect, // In the coords of rootLayer.
     2131    PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
    21322132{
    21332133    if (paintsIntoWindow() || paintsIntoCompositedAncestor()) {
    … …  
    21872187
    21882188// Up-call from compositing layer drawing callback.
    2189 void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect& clip)
     2189void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const FloatRect& clip)
    21902190{
    21912191#ifndef NDEBUG
    … …  
    21932193        page->setIsPainting(true);
    21942194#endif
     2195
     2196    // The dirtyRect is in the coords of the painting root.
     2197    LayoutRect dirtyRect(clip);
     2198    IntRect pixelSnappedRectForIntegralPositionedItems = pixelSnappedIntRect(dirtyRect);
    21952199
    21962200    if (graphicsLayer == m_graphicsLayer.get()
    … …  
    22012205        InspectorInstrumentation::willPaint(&renderer());
    22022206
    2203         // The dirtyRect is in the coords of the painting root.
    2204         IntRect dirtyRect = clip;
    22052207        if (!(paintingPhase & GraphicsLayerPaintOverflowContents))
    22062208            dirtyRect.intersect(enclosingIntRect(compositedBoundsIncludingMargin()));
    … …  
    22092211        paintIntoLayer(graphicsLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase);
    22102212
    2211         InspectorInstrumentation::didPaint(&renderer(), &context, clip);
     2213        InspectorInstrumentation::didPaint(&renderer(), &context, dirtyRect);
    22122214    } else if (graphicsLayer == layerForHorizontalScrollbar()) {
    2213         paintScrollbar(m_owningLayer.horizontalScrollbar(), context, clip);
     2215        paintScrollbar(m_owningLayer.horizontalScrollbar(), context, pixelSnappedRectForIntegralPositionedItems);
    22142216    } else if (graphicsLayer == layerForVerticalScrollbar()) {
    2215         paintScrollbar(m_owningLayer.verticalScrollbar(), context, clip);
     2217        paintScrollbar(m_owningLayer.verticalScrollbar(), context, pixelSnappedRectForIntegralPositionedItems);
    22162218    } else if (graphicsLayer == layerForScrollCorner()) {
    22172219        const LayoutRect& scrollCornerAndResizer = m_owningLayer.scrollCornerAndResizerRect();
    22182220        context.save();
    22192221        context.translate(-scrollCornerAndResizer.x(), -scrollCornerAndResizer.y());
    2220         LayoutRect transformedClip = clip;
     2222        LayoutRect transformedClip = LayoutRect(clip);
    22212223        transformedClip.moveBy(scrollCornerAndResizer.location());
    22222224        m_owningLayer.paintScrollCorner(&context, IntPoint(), pixelSnappedIntRect(transformedClip));

  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r163190 r163931  
    166166    virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) override;
    167167
    168     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& clip) override;
     168    virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& clip) override;
    169169
    170170    virtual float deviceScaleFactor() const override;
    … …  
    284284    GraphicsLayer* tileCacheFlatteningLayer() const { return m_usingTiledCacheLayer ? m_childContainmentLayer.get() : 0; }
    285285
    286     void paintIntoLayer(const GraphicsLayer*, GraphicsContext*, const IntRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
     286    void paintIntoLayer(const GraphicsLayer*, GraphicsContext*, const LayoutRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
    287287
    288288    // Helper function for updateGraphicsLayerGeometry.

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r163194 r163931  
    26092609}
    26102610
    2611 void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase, const IntRect& clip)
    2612 {
     2611void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip)
     2612{
     2613    IntRect pixelSnappedRectForIntegralPositionedItems = pixelSnappedIntRect(LayoutRect(clip));
    26132614    if (graphicsLayer == layerForHorizontalScrollbar())
    2614         paintScrollbar(m_renderView.frameView().horizontalScrollbar(), context, clip);
     2615        paintScrollbar(m_renderView.frameView().horizontalScrollbar(), context, pixelSnappedRectForIntegralPositionedItems);
    26152616    else if (graphicsLayer == layerForVerticalScrollbar())
    2616         paintScrollbar(m_renderView.frameView().verticalScrollbar(), context, clip);
     2617        paintScrollbar(m_renderView.frameView().verticalScrollbar(), context, pixelSnappedRectForIntegralPositionedItems);
    26172618    else if (graphicsLayer == layerForScrollCorner()) {
    26182619        const IntRect& scrollCorner = m_renderView.frameView().scrollCornerRect();
    26192620        context.save();
    26202621        context.translate(-scrollCorner.x(), -scrollCorner.y());
    2621         IntRect transformedClip = clip;
     2622        IntRect transformedClip = pixelSnappedRectForIntegralPositionedItems;
    26222623        transformedClip.moveBy(scrollCorner.location());
    26232624        m_renderView.frameView().paintScrollCorner(&context, transformedClip);

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.h

    r163190 r163931  
    308308    virtual void notifyAnimationStarted(const GraphicsLayer*, double) override { }
    309309    virtual void notifyFlushRequired(const GraphicsLayer*) override;
    310     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect&) override;
     310    virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect&) override;
    311311
    312312    virtual bool isTrackingRepaints() const override;

  • trunk/Source/WebKit/gtk/ChangeLog

    r163797 r163931  
     12014-02-11  Zalan Bujtas  <zalan@apple.com>
     2
     3        Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
     4        https://bugs.webkit.org/show_bug.cgi?id=128460
     5
     6        Reviewed by Simon Fraser.
     7
     8        GraphicsClient::paintContents takes clipRect as FloatRect now so that we can paint on
     9        subpixel position.
     10
     11        No change in functionality.
     12
     13        * WebCoreSupport/AcceleratedCompositingContext.h:
     14        * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
     15        (WebKit::AcceleratedCompositingContext::paintContents):
     16
    1172014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    218

  • trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h

    r163079 r163931  
    2020#define AcceleratedCompositingContext_h
    2121
     22#include "FloatRect.h"
    2223#include "GraphicsLayer.h"
    2324#include "GraphicsLayerClient.h"
    … …  
    5960    virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
    6061    virtual void notifyFlushRequired(const WebCore::GraphicsLayer*);
    61     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& rectToPaint);
     62    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint);
    6263
    6364    void initialize();

  • trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp

    r163079 r163931  
    397397}
    398398
    399 void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const IntRect& rectToPaint)
     399void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& rectToPaint)
    400400{
    401401    context.save();
    402402    context.clip(rectToPaint);
    403     core(m_webView)->mainFrame().view()->paint(&context, rectToPaint);
     403    core(m_webView)->mainFrame().view()->paint(&context, enclosingIntRect(rectToPaint));
    404404    context.restore();
    405405}

  • trunk/Source/WebKit/win/ChangeLog

    r163903 r163931  
     12014-02-11  Zalan Bujtas  <zalan@apple.com>
     2
     3        Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
     4        https://bugs.webkit.org/show_bug.cgi?id=128460
     5
     6        Reviewed by Simon Fraser.
     7
     8        GraphicsClient::paintContents takes clipRect as FloatRect now so that we can paint on
     9        subpixel position.
     10
     11        No change in functionality.
     12
     13        * WebView.cpp:
     14        (WebView::paintContents):
     15        * WebView.h:
     16
    1172014-02-11  Alex Christensen  <achristensen@webkit.org>
    218

  • trunk/Source/WebKit/win/WebView.cpp

    r163885 r163931  
    67316731}
    67326732
    6733 void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const IntRect& inClip)
     6733void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& inClip)
    67346734{
    67356735    Frame* frame = core(m_mainFrame);
    … …  
    67396739    context.save();
    67406740    context.clip(inClip);
    6741     frame->view()->paint(&context, inClip);
     6741    frame->view()->paint(&context, enclosingIntRect(inClip));
    67426742    context.restore();
    67436743}

  • trunk/Source/WebKit/win/WebView.h

    r163079 r163931  
    10201020    virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
    10211021    virtual void notifyFlushRequired(const WebCore::GraphicsLayer*);
    1022     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip);
     1022    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& inClip);
    10231023
    10241024    // CACFLayerTreeHostClient

  • trunk/Source/WebKit2/ChangeLog

    r163930 r163931  
     12014-02-11  Zalan Bujtas  <zalan@apple.com>
     2
     3        Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
     4        https://bugs.webkit.org/show_bug.cgi?id=128460
     5
     6        Reviewed by Simon Fraser.
     7
     8        GraphicsClient::paintContents takes clipRect as FloatRect now so that we can paint on
     9        subpixel position.
     10
     11        No change in functionality.
     12
     13        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
     14        (WebKit::LayerTreeHostGtk::paintContents):
     15        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
     16        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
     17        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
     18        (WebKit::RemoteLayerTreeDrawingArea::paintContents):
     19        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
     20        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
     21        (WebKit::TiledCoreAnimationDrawingArea::paintContents):
     22
    1232014-02-11  Sam Weinig  <sam@webkit.org>
    224

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

    r158110 r163931  
    273273}
    274274
    275 void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
     275void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
    276276{
    277277    if (graphicsLayer == m_nonCompositedContentLayer.get()) {
    278         m_webPage->drawRect(graphicsContext, clipRect);
     278        m_webPage->drawRect(graphicsContext, enclosingIntRect(clipRect));
    279279        return;
    280280    }
    … …  
    282282    for (auto& pageOverlayLayer : m_pageOverlayLayers) {
    283283        if (pageOverlayLayer.value.get() == graphicsLayer) {
    284             m_webPage->drawPageOverlay(pageOverlayLayer.key, graphicsContext, clipRect);
     284            m_webPage->drawPageOverlay(pageOverlayLayer.key, graphicsContext, enclosingIntRect(clipRect));
    285285            break;
    286286        }

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h

    r162139 r163931  
    8080    virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
    8181    virtual void notifyFlushRequired(const WebCore::GraphicsLayer*);
    82     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect);
     82    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect);
    8383    virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const { }
    8484

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h

    r162730 r163931  
    8181    virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override { }
    8282    virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) override { }
    83     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect) override;
     83    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
    8484    virtual float deviceScaleFactor() const override;
    8585    virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const override { }

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

    r163666 r163931  
    190190}
    191191
    192 void RemoteLayerTreeDrawingArea::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
     192void RemoteLayerTreeDrawingArea::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
    193193{
    194194    for (const auto& overlayAndLayer : m_pageOverlayLayers) {
    195195        if (overlayAndLayer.value.get() == graphicsLayer) {
    196             m_webPage->drawPageOverlay(overlayAndLayer.key, graphicsContext, clipRect);
     196            m_webPage->drawPageOverlay(overlayAndLayer.key, graphicsContext, enclosingIntRect(clipRect));
    197197            break;
    198198        }

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h

    r163676 r163931  
    9595    virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) override;
    9696    virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
    97     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect) override;
     97    virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
    9898    virtual float deviceScaleFactor() const override;
    9999    virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const override;

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

    r163230 r163931  
    357357}
    358358
    359 void TiledCoreAnimationDrawingArea::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
     359void TiledCoreAnimationDrawingArea::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
    360360{
    361361    for (auto it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
    362362        if (it->value.get() == graphicsLayer) {
    363             m_webPage->drawPageOverlay(it->key, graphicsContext, clipRect);
     363            m_webPage->drawPageOverlay(it->key, graphicsContext, enclosingIntRect(clipRect));
    364364            break;
    365365        }
Note: See TracChangeset for help on using the changeset viewer.