Attachment 350000 Details for Bug 189689 – Patch

[patch] Patch

bug-189689-20180917220259.patch (text/plain), 4.30 KB, created by Simon Fraser (smfr) on 2018-09-17 22:03:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-09-17 22:03:00 PDT

Size: 4.30 KB

patch

obsolete

>Subversion Revision: 236100
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c336c14498a27ac266169516016de580cb2b6326..a7b3c0dcb64ecf29285d151815a6ebb8119f17c6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Remove the unused RenderLayerCompositor::enclosingCompositorFlushingLayers()
>+        https://bugs.webkit.org/show_bug.cgi?id=189689
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        enclosingCompositorFlushingLayers() was added in r76196 but never used. Also use
>+        a SetForScope<>.
>+
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
>+        (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers const): Deleted.
>+        * rendering/RenderLayerCompositor.h:
>+
> 2018-09-17  Simon Fraser  <simon.fraser@apple.com>
> 
>         Many modern media control tests leak documents in testing
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index ebb453a8ba973f39935ef45a5b32188b8ec781c3..f8b5cd66984677df6544a2b4bddb02cd613648fd 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -482,16 +482,17 @@ void RenderLayerCompositor::flushPendingLayerChanges(bool isFlushRoot)
>     AnimationUpdateBlock animationUpdateBlock(&frameView.frame().animation());
> 
>     ASSERT(!m_flushingLayers);
>-    m_flushingLayers = true;
>+    {
>+        SetForScope<bool> flushingLayersScope(m_flushingLayers, true);
> 
>-    if (auto* rootLayer = rootGraphicsLayer()) {
>-        FloatRect visibleRect = visibleRectForLayerFlushing();
>-        LOG_WITH_STREAM(Compositing,  stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges (is root " << isFlushRoot << ") visible rect " << visibleRect);
>-        rootLayer->flushCompositingState(visibleRect);
>+        if (auto* rootLayer = rootGraphicsLayer()) {
>+            FloatRect visibleRect = visibleRectForLayerFlushing();
>+            LOG_WITH_STREAM(Compositing,  stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges (is root " << isFlushRoot << ") visible rect " << visibleRect);
>+            rootLayer->flushCompositingState(visibleRect);
>+        }
>+        
>+        ASSERT(m_flushingLayers);
>     }
>-    
>-    ASSERT(m_flushingLayers);
>-    m_flushingLayers = false;
> 
>     updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
> 
>@@ -628,17 +629,6 @@ void RenderLayerCompositor::layerTiledBackingUsageChanged(const GraphicsLayer* g
>     }
> }
> 
>-RenderLayerCompositor* RenderLayerCompositor::enclosingCompositorFlushingLayers() const
>-{
>-    for (auto* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree().parent()) {
>-        auto* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : nullptr;
>-        if (compositor->isFlushingLayers())
>-            return compositor;
>-    }
>-    
>-    return nullptr;
>-}
>-
> void RenderLayerCompositor::scheduleCompositingLayerUpdate()
> {
>     if (!m_updateCompositingLayersTimer.isActive())
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h
>index 6494e6593ee393cd352bfb1db8b2cdd3536a98db..5a4ba80f6a7a72acea75610b4f778e42f2638023 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.h
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.h
>@@ -125,10 +125,6 @@ public:
>     void scheduleLayerFlush(bool canThrottle);
>     void flushPendingLayerChanges(bool isFlushRoot = true);
>     
>-    // flushPendingLayerChanges() flushes the entire GraphicsLayer tree, which can cross frame boundaries.
>-    // This call returns the rootmost compositor that is being flushed (including self).
>-    RenderLayerCompositor* enclosingCompositorFlushingLayers() const;
>-
>     // Called when the GraphicsLayer for the given RenderLayer has flushed changes inside of flushPendingLayerChanges().
>     void didFlushChangesForLayer(RenderLayer&, const GraphicsLayer*);
> 
>@@ -407,7 +403,6 @@ private:
> 
>     void notifyIFramesOfCompositingChange();
> 
>-    bool isFlushingLayers() const { return m_flushingLayers; }
>     void updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
>     void updateScrollCoordinatedLayersAfterFlush();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189689: 350000