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

Changeset 245422 in webkit


Ignore:
Timestamp:
May 16, 2019, 4:27:37 PM (7 years ago)
Author:
Kocsen Chung
Message:

Revert r245205. rdar://problem/50652127

Location:
branches/safari-608.1.24-branch
Files:
14 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-608.1.24-branch/LayoutTests/ChangeLog

    r245420 r245422  
     12019-05-16  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r245205. rdar://problem/50652127
     4
    152019-05-16  Kocsen Chung  <kocsen_chung@apple.com>
    26

  • branches/safari-608.1.24-branch/Source/WebCore/ChangeLog

    r245421 r245422  
     12019-05-16  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r245205. rdar://problem/50652127
     4
    152019-05-16  Kocsen Chung  <kocsen_chung@apple.com>
    26

  • branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.cpp

    r245389 r245422  
    41014101    }
    41024102
    4103     paintLayerWithEffects(context, paintingInfo, paintFlags);
    4104 }
    4105 
    4106 void RenderLayer::paintLayerWithEffects(GraphicsContext& context, const LayerPaintingInfo& paintingInfo, OptionSet<PaintLayerFlag> paintFlags)
    4107 {
    41084103    // Non self-painting leaf layers don't need to be painted as their renderer() should properly paint itself.
    41094104    if (!isSelfPaintingLayer() && !hasSelfPaintingLayerDescendant())
    … …  
    41124107    if (shouldSuppressPaintingLayer(this))
    41134108        return;
    4114 
     4109   
    41154110    // If this layer is totally invisible then there is nothing to paint.
    41164111    if (!renderer().opacity())

  • branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.h

    r245389 r245422  
    10041004
    10051005    void paintLayer(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
    1006     void paintLayerWithEffects(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
    1007 
    10081006    void paintLayerContentsAndReflection(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
    10091007    void paintLayerByApplyingTransform(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>, const LayoutSize& translationOffset = LayoutSize());

  • branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp

    r245421 r245422  
    26692669        RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, -m_subpixelOffsetFromRenderer);
    26702670
    2671         if (&layer == &m_owningLayer) {
    2672             layer.paintLayerContents(context, paintingInfo, paintFlags);
    2673 
    2674             if (layer.containsDirtyOverlayScrollbars())
    2675                 layer.paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
    2676         } else
    2677             layer.paintLayerWithEffects(context, paintingInfo, paintFlags);
     2671        layer.paintLayerContents(context, paintingInfo, paintFlags);
     2672
     2673        if (layer.containsDirtyOverlayScrollbars())
     2674            layer.paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
    26782675
    26792676        if (layer.isRenderViewLayer())

  • branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r245421 r245422  
    242242            childState.stackingContextAncestor = stackingContextAncestor;
    243243
    244         childState.backingSharingAncestor = backingSharingAncestor;
    245244        childState.subtreeIsCompositing = false;
    246245        childState.testingOverlap = testingOverlap;
    … …  
    270269
    271270    RenderLayer* compositingAncestor;
    272     RenderLayer* backingSharingAncestor { nullptr };
    273271    RenderLayer* stackingContextAncestor { nullptr };
    274272    bool subtreeIsCompositing { false };
    … …  
    863861static bool backingProviderLayerCanIncludeLayer(const RenderLayer& sharedLayer, const RenderLayer& layer)
    864862{
    865     // Disable sharing when painting shared layers doesn't work correctly.
    866     if (layer.hasReflection())
    867         return false;
    868 
    869863    return layer.ancestorLayerIsInContainingBlockChain(sharedLayer);
    870864}
    … …  
    988982        LOG_WITH_STREAM(Compositing, stream << &layer << " is compositing - flushing sharing to " << backingSharingState.backingProviderCandidate << " with " << backingSharingState.backingSharingLayers.size() << " sharing layers");
    989983        backingSharingState.resetBackingProviderCandidate();
    990     } else if (layerPaintsIntoProvidedBacking) {
    991         childState.backingSharingAncestor = &layer;
    992         overlapMap.pushCompositingContainer();
    993984    }
    994985
    … …  
    10741065#endif
    10751066
    1076     if ((childState.compositingAncestor == &layer && !layer.isRenderViewLayer()) || childState.backingSharingAncestor == &layer)
     1067    if (childState.compositingAncestor == &layer && !layer.isRenderViewLayer())
    10771068        overlapMap.popCompositingContainer();
    10781069
    … …  
    12381229#endif
    12391230
    1240     if ((childState.compositingAncestor == &layer && !layer.isRenderViewLayer()) || childState.backingSharingAncestor == &layer)
     1231    if (childState.compositingAncestor == &layer && !layer.isRenderViewLayer())
    12411232        overlapMap.popCompositingContainer();
    12421233
Note: See TracChangeset for help on using the changeset viewer.