⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 245950 in webkit


Ignore:
Timestamp:
May 30, 2019, 10:50:50 PM (7 years ago)
Author:
Simon Fraser
Message:

Use an OptionSet<> for GraphicsLayerPaintingPhase
​https://bugs.webkit.org/show_bug.cgi?id=198404

Reviewed by Tim Horton.

Replace GraphicsLayerPaintingPhase with OptionSet<GraphicsLayerPaintingPhase>.

No behavior change.

Source/WebCore:

  • page/PageOverlayController.cpp:

(WebCore::PageOverlayController::setPageOverlayNeedsDisplay):
(WebCore::PageOverlayController::paintContents):
(WebCore::PageOverlayController::notifyFlushRequired):

  • page/PageOverlayController.h:
  • page/linux/ResourceUsageOverlayLinux.cpp:
  • page/mac/ServicesOverlayController.h:
  • page/mac/ServicesOverlayController.mm:

(WebCore::ServicesOverlayController::Highlight::paintContents):

  • platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::dumpProperties const):

  • platform/graphics/GraphicsLayer.h:

(WebCore::GraphicsLayer::paintingPhase const):
(WebCore::GraphicsLayer::setPaintingPhase):

  • platform/graphics/GraphicsLayerClient.h:

(WebCore::GraphicsLayerClient::paintContents):

  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateForegroundLayer):
(WebCore::RenderLayerBacking::updateBackgroundLayer):
(WebCore::RenderLayerBacking::updateMaskingLayer):
(WebCore::RenderLayerBacking::updateChildClippingStrategy):
(WebCore::RenderLayerBacking::updateScrollingLayers):
(WebCore::RenderLayerBacking::paintingPhaseForPrimaryLayer const):
(WebCore::RenderLayerBacking::paintIntoLayer):
(WebCore::RenderLayerBacking::paintContents):

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

(WebCore::RenderLayerCompositor::paintContents):

  • rendering/RenderLayerCompositor.h:

Source/WebKitLegacy/win:

  • WebCoreSupport/AcceleratedCompositingContext.cpp:

(AcceleratedCompositingContext::paintContents):

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

(WebView::paintContents):

  • WebView.h:
Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r245948 r245950  
     12019-05-30  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Use an OptionSet<> for GraphicsLayerPaintingPhase
     4        https://bugs.webkit.org/show_bug.cgi?id=198404
     5
     6        Reviewed by Tim Horton.
     7
     8        Replace GraphicsLayerPaintingPhase with OptionSet<GraphicsLayerPaintingPhase>.
     9
     10        No behavior change.
     11
     12        * page/PageOverlayController.cpp:
     13        (WebCore::PageOverlayController::setPageOverlayNeedsDisplay):
     14        (WebCore::PageOverlayController::paintContents):
     15        (WebCore::PageOverlayController::notifyFlushRequired):
     16        * page/PageOverlayController.h:
     17        * page/linux/ResourceUsageOverlayLinux.cpp:
     18        * page/mac/ServicesOverlayController.h:
     19        * page/mac/ServicesOverlayController.mm:
     20        (WebCore::ServicesOverlayController::Highlight::paintContents):
     21        * platform/graphics/GraphicsLayer.cpp:
     22        (WebCore::GraphicsLayer::dumpProperties const):
     23        * platform/graphics/GraphicsLayer.h:
     24        (WebCore::GraphicsLayer::paintingPhase const):
     25        (WebCore::GraphicsLayer::setPaintingPhase):
     26        * platform/graphics/GraphicsLayerClient.h:
     27        (WebCore::GraphicsLayerClient::paintContents):
     28        * rendering/RenderLayerBacking.cpp:
     29        (WebCore::RenderLayerBacking::updateForegroundLayer):
     30        (WebCore::RenderLayerBacking::updateBackgroundLayer):
     31        (WebCore::RenderLayerBacking::updateMaskingLayer):
     32        (WebCore::RenderLayerBacking::updateChildClippingStrategy):
     33        (WebCore::RenderLayerBacking::updateScrollingLayers):
     34        (WebCore::RenderLayerBacking::paintingPhaseForPrimaryLayer const):
     35        (WebCore::RenderLayerBacking::paintIntoLayer):
     36        (WebCore::RenderLayerBacking::paintContents):
     37        * rendering/RenderLayerBacking.h:
     38        * rendering/RenderLayerCompositor.cpp:
     39        (WebCore::RenderLayerCompositor::paintContents):
     40        * rendering/RenderLayerCompositor.h:
     41
    1422019-05-30  Youenn Fablet  <youenn@apple.com>
    243

  • trunk/Source/WebCore/page/PageOverlayController.cpp

    r244182 r245950  
    251251}
    252252
    253 void PageOverlayController::setPageOverlayNeedsDisplay(PageOverlay& overlay, const WebCore::IntRect& dirtyRect)
     253void PageOverlayController::setPageOverlayNeedsDisplay(PageOverlay& overlay, const IntRect& dirtyRect)
    254254{
    255255    ASSERT(m_pageOverlays.contains(&overlay));
    … …  
    392392}
    393393
    394 void PageOverlayController::paintContents(const WebCore::GraphicsLayer* graphicsLayer, WebCore::GraphicsContext& graphicsContext, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect, GraphicsLayerPaintBehavior)
     394void PageOverlayController::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clipRect, GraphicsLayerPaintBehavior)
    395395{
    396396    for (auto& overlayAndGraphicsLayer : m_overlayGraphicsLayers) {
    … …  
    411411}
    412412
    413 void PageOverlayController::notifyFlushRequired(const WebCore::GraphicsLayer*)
     413void PageOverlayController::notifyFlushRequired(const GraphicsLayer*)
    414414{
    415415    m_page.renderingUpdateScheduler().scheduleRenderingUpdate();

  • trunk/Source/WebCore/page/PageOverlayController.h

    r241978 r245950  
    9494    // GraphicsLayerClient
    9595    void notifyFlushRequired(const GraphicsLayer*) override;
    96     void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& clipRect, GraphicsLayerPaintBehavior) override;
     96    void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clipRect, GraphicsLayerPaintBehavior) override;
    9797    float deviceScaleFactor() const override;
    9898    bool shouldSkipLayerInDump(const GraphicsLayer*, LayerTreeAsTextBehavior) const override;

  • trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp

    r245504 r245950  
    8585
    8686private:
    87     void paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior) override
     87    void paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior) override
    8888    {
    8989        GraphicsContextStateSaver stateSaver(context);

  • trunk/Source/WebCore/page/mac/ServicesOverlayController.h

    r236016 r245950  
    8383        // GraphicsLayerClient
    8484        void notifyFlushRequired(const GraphicsLayer*) override;
    85         void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& inClip, GraphicsLayerPaintBehavior) override;
     85        void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& inClip, GraphicsLayerPaintBehavior) override;
    8686        float deviceScaleFactor() const override;
    8787

  • trunk/Source/WebCore/page/mac/ServicesOverlayController.mm

    r244182 r245950  
    125125}
    126126
    127 void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect&, GraphicsLayerPaintBehavior)
     127void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect&, GraphicsLayerPaintBehavior)
    128128{
    129129    if (!DataDetectorsLibrary())

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

    r245786 r245950  
    936936        ts << indent << "(paintingPhases\n";
    937937        TextStream::IndentScope indentScope(ts);
    938         if (paintingPhase() & GraphicsLayerPaintBackground)
     938        if (paintingPhase().contains(GraphicsLayerPaintingPhase::Background))
    939939            ts << indent << "GraphicsLayerPaintBackground\n";
    940940
    941         if (paintingPhase() & GraphicsLayerPaintForeground)
     941        if (paintingPhase().contains(GraphicsLayerPaintingPhase::Foreground))
    942942            ts << indent << "GraphicsLayerPaintForeground\n";
    943943
    944         if (paintingPhase() & GraphicsLayerPaintMask)
     944        if (paintingPhase().contains(GraphicsLayerPaintingPhase::Mask))
    945945            ts << indent << "GraphicsLayerPaintMask\n";
    946946
    947         if (paintingPhase() & GraphicsLayerPaintChildClippingMask)
     947        if (paintingPhase().contains(GraphicsLayerPaintingPhase::ChildClippingMask))
    948948            ts << indent << "GraphicsLayerPaintChildClippingMask\n";
    949949
    950         if (paintingPhase() & GraphicsLayerPaintOverflowContents)
     950        if (paintingPhase().contains(GraphicsLayerPaintingPhase::OverflowContents))
    951951            ts << indent << "GraphicsLayerPaintOverflowContents\n";
    952952
    953         if (paintingPhase() & GraphicsLayerPaintCompositedScroll)
     953        if (paintingPhase().contains(GraphicsLayerPaintingPhase::CompositedScroll))
    954954            ts << indent << "GraphicsLayerPaintCompositedScroll\n";
    955955

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

    r245786 r245950  
    415415
    416416    // Some GraphicsLayers paint only the foreground or the background content
    417     GraphicsLayerPaintingPhase paintingPhase() const { return m_paintingPhase; }
    418     void setPaintingPhase(GraphicsLayerPaintingPhase phase) { m_paintingPhase = phase; }
     417    OptionSet<GraphicsLayerPaintingPhase> paintingPhase() const { return m_paintingPhase; }
     418    void setPaintingPhase(OptionSet<GraphicsLayerPaintingPhase> phase) { m_paintingPhase = phase; }
    419419
    420420    enum ShouldClipToLayer {
    … …  
    692692    const Type m_type;
    693693    CustomAppearance m_customAppearance { CustomAppearance::None };
    694     GraphicsLayerPaintingPhase m_paintingPhase { GraphicsLayerPaintAllWithOverflowClip };
     694    OptionSet<GraphicsLayerPaintingPhase> m_paintingPhase { GraphicsLayerPaintingPhase::Foreground, GraphicsLayerPaintingPhase::Background };
    695695    CompositingCoordinatesOrientation m_contentsOrientation { CompositingCoordinatesOrientation::TopDown }; // affects orientation of layer contents
    696696

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

    r243674 r245950  
    3939class TransformationMatrix;
    4040
    41 enum GraphicsLayerPaintingPhaseFlags {
    42     GraphicsLayerPaintBackground            = 1 << 0,
    43     GraphicsLayerPaintForeground            = 1 << 1,
    44     GraphicsLayerPaintMask                  = 1 << 2,
    45     GraphicsLayerPaintClipPath              = 1 << 3,
    46     GraphicsLayerPaintOverflowContents      = 1 << 4,
    47     GraphicsLayerPaintCompositedScroll      = 1 << 5,
    48     GraphicsLayerPaintChildClippingMask     = 1 << 6,
    49     GraphicsLayerPaintAllWithOverflowClip   = GraphicsLayerPaintBackground | GraphicsLayerPaintForeground
     41enum class GraphicsLayerPaintingPhase {
     42    Background            = 1 << 0,
     43    Foreground            = 1 << 1,
     44    Mask                  = 1 << 2,
     45    ClipPath              = 1 << 3,
     46    OverflowContents      = 1 << 4,
     47    CompositedScroll      = 1 << 5,
     48    ChildClippingMask     = 1 << 6,
    5049};
    51 typedef uint8_t GraphicsLayerPaintingPhase;
    5250
    5351enum AnimatedPropertyID {
    … …  
    103101    virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) { }
    104102
    105     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& /* inClip */, GraphicsLayerPaintBehavior) { }
     103    virtual void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& /* inClip */, GraphicsLayerPaintBehavior) { }
    106104    virtual void didChangePlatformLayerForLayer(const GraphicsLayer*) { }
    107105

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

    r245837 r245950  
    17101710            m_foregroundLayer = createGraphicsLayer(layerName);
    17111711            m_foregroundLayer->setDrawsContent(true);
    1712             m_foregroundLayer->setPaintingPhase(GraphicsLayerPaintForeground);
     1712            m_foregroundLayer->setPaintingPhase({ GraphicsLayerPaintingPhase::Foreground });
    17131713            layerChanged = true;
    17141714        }
    … …  
    17361736            m_backgroundLayer->setDrawsContent(true);
    17371737            m_backgroundLayer->setAnchorPoint(FloatPoint3D());
    1738             m_backgroundLayer->setPaintingPhase(GraphicsLayerPaintBackground);
     1738            m_backgroundLayer->setPaintingPhase({ GraphicsLayerPaintingPhase::Background });
    17391739            layerChanged = true;
    17401740        }
    … …  
    17721772    bool layerChanged = false;
    17731773    if (hasMask || hasClipPath) {
    1774         GraphicsLayerPaintingPhase maskPhases = 0;
     1774        OptionSet<GraphicsLayerPaintingPhase> maskPhases;
    17751775        if (hasMask)
    1776             maskPhases = GraphicsLayerPaintMask;
     1776            maskPhases = GraphicsLayerPaintingPhase::Mask;
    17771777       
    17781778        if (hasClipPath) {
    17791779            // If we have a mask, we need to paint the combined clip-path and mask into the mask layer.
    17801780            if (hasMask || renderer().style().clipPath()->type() == ClipPathOperation::Reference || !GraphicsLayer::supportsLayerType(GraphicsLayer::Type::Shape))
    1781                 maskPhases |= GraphicsLayerPaintClipPath;
    1782         }
    1783 
    1784         bool paintsContent = maskPhases;
     1781                maskPhases.add(GraphicsLayerPaintingPhase::ClipPath);
     1782        }
     1783
     1784        bool paintsContent = !maskPhases.isEmpty();
    17851785        GraphicsLayer::Type requiredLayerType = paintsContent ? GraphicsLayer::Type::Normal : GraphicsLayer::Type::Shape;
    17861786        if (m_maskLayer && m_maskLayer->type() != requiredLayerType) {
    … …  
    18261826                m_childClippingMaskLayer = createGraphicsLayer("child clipping mask");
    18271827                m_childClippingMaskLayer->setDrawsContent(true);
    1828                 m_childClippingMaskLayer->setPaintingPhase(GraphicsLayerPaintChildClippingMask);
     1828                m_childClippingMaskLayer->setPaintingPhase({ GraphicsLayerPaintingPhase::ChildClippingMask });
    18291829                clippingLayer()->setMaskLayer(m_childClippingMaskLayer.copyRef());
    18301830            }
    … …  
    18571857        m_scrolledContentsLayer->setAnchorPoint({ });
    18581858
    1859         GraphicsLayerPaintingPhase paintPhase = GraphicsLayerPaintOverflowContents | GraphicsLayerPaintCompositedScroll;
     1859        OptionSet<GraphicsLayerPaintingPhase> paintPhases = { GraphicsLayerPaintingPhase::OverflowContents, GraphicsLayerPaintingPhase::CompositedScroll };
    18601860        if (!m_foregroundLayer)
    1861             paintPhase |= GraphicsLayerPaintForeground;
    1862         m_scrolledContentsLayer->setPaintingPhase(paintPhase);
     1861            paintPhases.add(GraphicsLayerPaintingPhase::Foreground);
     1862        m_scrolledContentsLayer->setPaintingPhase(paintPhases);
    18631863        m_scrollContainerLayer->addChild(*m_scrolledContentsLayer);
    18641864    } else {
    … …  
    19401940}
    19411941
    1942 GraphicsLayerPaintingPhase RenderLayerBacking::paintingPhaseForPrimaryLayer() const
    1943 {
    1944     unsigned phase = 0;
     1942OptionSet<GraphicsLayerPaintingPhase> RenderLayerBacking::paintingPhaseForPrimaryLayer() const
     1943{
     1944    OptionSet<GraphicsLayerPaintingPhase> phases;
    19451945    if (!m_backgroundLayer)
    1946         phase |= GraphicsLayerPaintBackground;
     1946        phases.add(GraphicsLayerPaintingPhase::Background);
    19471947    if (!m_foregroundLayer)
    1948         phase |= GraphicsLayerPaintForeground;
     1948        phases.add(GraphicsLayerPaintingPhase::Foreground);
    19491949
    19501950    if (m_scrolledContentsLayer) {
    1951         phase &= ~GraphicsLayerPaintForeground;
    1952         phase |= GraphicsLayerPaintCompositedScroll;
    1953     }
    1954 
    1955     return static_cast<GraphicsLayerPaintingPhase>(phase);
     1951        phases.remove(GraphicsLayerPaintingPhase::Foreground);
     1952        phases.add(GraphicsLayerPaintingPhase::CompositedScroll);
     1953    }
     1954
     1955    return phases;
    19561956}
    19571957
    … …  
    26472647void RenderLayerBacking::paintIntoLayer(const GraphicsLayer* graphicsLayer, GraphicsContext& context,
    26482648    const IntRect& paintDirtyRect, // In the coords of rootLayer.
    2649     OptionSet<PaintBehavior> paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
    2650 {
    2651     if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && paintingPhase != GraphicsLayerPaintChildClippingMask) {
     2649    OptionSet<PaintBehavior> paintBehavior, OptionSet<GraphicsLayerPaintingPhase> paintingPhase)
     2650{
     2651    if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && paintingPhase != OptionSet<GraphicsLayerPaintingPhase>(GraphicsLayerPaintingPhase::ChildClippingMask)) {
    26522652#if !PLATFORM(IOS_FAMILY) && !OS(WINDOWS)
    26532653        // FIXME: Looks like the CALayer tree is out of sync with the GraphicsLayer heirarchy
    … …  
    26602660
    26612661    OptionSet<RenderLayer::PaintLayerFlag> paintFlags;
    2662     if (paintingPhase & GraphicsLayerPaintBackground)
     2662    if (paintingPhase.contains(GraphicsLayerPaintingPhase::Background))
    26632663        paintFlags.add(RenderLayer::PaintLayerPaintingCompositingBackgroundPhase);
    2664     if (paintingPhase & GraphicsLayerPaintForeground)
     2664    if (paintingPhase.contains(GraphicsLayerPaintingPhase::Foreground))
    26652665        paintFlags.add(RenderLayer::PaintLayerPaintingCompositingForegroundPhase);
    2666     if (paintingPhase & GraphicsLayerPaintMask)
     2666    if (paintingPhase.contains(GraphicsLayerPaintingPhase::Mask))
    26672667        paintFlags.add(RenderLayer::PaintLayerPaintingCompositingMaskPhase);
    2668     if (paintingPhase & GraphicsLayerPaintClipPath)
     2668    if (paintingPhase.contains(GraphicsLayerPaintingPhase::ClipPath))
    26692669        paintFlags.add(RenderLayer::PaintLayerPaintingCompositingClipPathPhase);
    2670     if (paintingPhase & GraphicsLayerPaintChildClippingMask)
     2670    if (paintingPhase.contains(GraphicsLayerPaintingPhase::ChildClippingMask))
    26712671        paintFlags.add(RenderLayer::PaintLayerPaintingChildClippingMaskPhase);
    2672     if (paintingPhase & GraphicsLayerPaintOverflowContents)
     2672    if (paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
    26732673        paintFlags.add(RenderLayer::PaintLayerPaintingOverflowContents);
    2674     if (paintingPhase & GraphicsLayerPaintCompositedScroll)
     2674    if (paintingPhase.contains(GraphicsLayerPaintingPhase::CompositedScroll))
    26752675        paintFlags.add(RenderLayer::PaintLayerPaintingCompositingScrollingPhase);
    26762676
    … …  
    27192719            RenderLayer::PaintLayerPaintingCompositingForegroundPhase };
    27202720
    2721         if (paintingPhase & GraphicsLayerPaintOverflowContents)
     2721        if (paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
    27222722            sharingLayerPaintFlags.add(RenderLayer::PaintLayerPaintingOverflowContents);
    27232723
    … …  
    27302730
    27312731// Up-call from compositing layer drawing callback.
    2732 void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior layerPaintBehavior)
     2732void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase> paintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior layerPaintBehavior)
    27332733{
    27342734#ifndef NDEBUG
    … …  
    27552755        || graphicsLayer == m_scrolledContentsLayer.get()) {
    27562756
    2757         if (!(paintingPhase & GraphicsLayerPaintOverflowContents))
     2757        if (!paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
    27582758            dirtyRect.intersect(enclosingIntRect(compositedBoundsIncludingMargin()));
    27592759

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

    r245207 r245950  
    236236    void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) override;
    237237
    238     void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior) override;
     238    void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior) override;
    239239
    240240    float deviceScaleFactor() const override;
    … …  
    334334    void setBackgroundLayerPaintsFixedRootBackground(bool);
    335335
    336     GraphicsLayerPaintingPhase paintingPhaseForPrimaryLayer() const;
     336    OptionSet<GraphicsLayerPaintingPhase> paintingPhaseForPrimaryLayer() const;
    337337   
    338338    LayoutSize contentOffsetInCompositingLayer() const;
    … …  
    386386    GraphicsLayer* tileCacheFlatteningLayer() const { return m_isFrameLayerWithTiledBacking ? m_childContainmentLayer.get() : nullptr; }
    387387
    388     void paintIntoLayer(const GraphicsLayer*, GraphicsContext&, const IntRect& paintDirtyRect, OptionSet<PaintBehavior>, GraphicsLayerPaintingPhase);
     388    void paintIntoLayer(const GraphicsLayer*, GraphicsContext&, const IntRect& paintDirtyRect, OptionSet<PaintBehavior>, OptionSet<GraphicsLayerPaintingPhase>);
    389389
    390390    static CSSPropertyID graphicsLayerToCSSProperty(AnimatedPropertyID);

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

    r245854 r245950  
    32753275}
    32763276
    3277 void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior)
     3277void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior)
    32783278{
    32793279#if PLATFORM(MAC)

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

    r245772 r245950  
    378378    // GraphicsLayerClient implementation
    379379    void notifyFlushRequired(const GraphicsLayer*) override;
    380     void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect&, GraphicsLayerPaintBehavior) override;
     380    void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect&, GraphicsLayerPaintBehavior) override;
    381381    void customPositionForVisibleRectComputation(const GraphicsLayer*, FloatPoint&) const override;
    382382    bool isTrackingRepaints() const override { return m_isTrackingRepaints; }

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r245778 r245950  
     12019-05-30  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Use an OptionSet<> for GraphicsLayerPaintingPhase
     4        https://bugs.webkit.org/show_bug.cgi?id=198404
     5
     6        Reviewed by Tim Horton.
     7
     8        Replace GraphicsLayerPaintingPhase with OptionSet<GraphicsLayerPaintingPhase>.
     9
     10        No behavior change.
     11
     12        * WebCoreSupport/AcceleratedCompositingContext.cpp:
     13        (AcceleratedCompositingContext::paintContents):
     14        * WebCoreSupport/AcceleratedCompositingContext.h:
     15        * WebView.cpp:
     16        (WebView::paintContents):
     17        * WebView.h:
     18
    1192019-05-26  Wenson Hsieh  <wenson_hsieh@apple.com>
    220

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp

    r245088 r245950  
    401401}
    402402
    403 void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& rectToPaint, GraphicsLayerPaintBehavior)
     403void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& rectToPaint, GraphicsLayerPaintBehavior)
    404404{
    405405    context.save();

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.h

    r236016 r245950  
    5353
    5454    // GraphicsLayerClient
    55     void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& rectToPaint, WebCore::GraphicsLayerPaintBehavior) override;
     55    void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, OptionSet<WebCore::GraphicsLayerPaintingPhase>, const WebCore::FloatRect& rectToPaint, WebCore::GraphicsLayerPaintBehavior) override;
    5656    float deviceScaleFactor() const override;
    5757

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

    r244932 r245950  
    73647364}
    73657365
    7366 void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& inClipPixels, GraphicsLayerPaintBehavior)
     7366void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& inClipPixels, GraphicsLayerPaintBehavior)
    73677367{
    73687368    Frame* frame = core(m_mainFrame);

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

    r244932 r245950  
    569569    void notifyAnimationStarted(const WebCore::GraphicsLayer*, const String&, MonotonicTime) override;
    570570    void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
    571     void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& inClip, WebCore::GraphicsLayerPaintBehavior) override;
     571    void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, OptionSet<WebCore::GraphicsLayerPaintingPhase>, const WebCore::FloatRect& inClip, WebCore::GraphicsLayerPaintBehavior) override;
    572572
    573573#if USE(CA)
Note: See TracChangeset for help on using the changeset viewer.