Attachment 368405 Details for Bug 197345 – Patch

[patch] Patch

bug-197345-20190427112412.patch (text/plain), 4.29 KB, created by Simon Fraser (smfr) on 2019-04-27 11:24:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-04-27 11:24:13 PDT

Size: 4.29 KB

patch

obsolete

>Subversion Revision: 244714
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6b5c3d2f742ff403c9c82b5d037efc30d61c0e88..2414377b3ef476cefd2420da657cb1b5b14c234c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-04-27  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Move some Compositing logging to the Layers log channel
>+        https://bugs.webkit.org/show_bug.cgi?id=197345
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make Compositing logging a bit less verbose by moving the GraphicsLayer tree dump
>+        to the Layers log channel. Also log GraphicsLayers after flushing, when we'll have
>+        accurate visible rects. 
>+
>+        * platform/graphics/ca/GraphicsLayerCA.cpp:
>+        (WebCore::GraphicsLayerCA::updateCoverage):
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::layersLogEnabled):
>+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
>+        (WebCore::RenderLayerCompositor::updateCompositingLayers):
>+
> 2019-04-26  Jessie Berlin  <jberlin@webkit.org>
> 
>         Add new mac target numbers
>diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>index a939a35abddefccb9d09681bae455d3dce1d58c4..90c803c261713f6e042359d8eafbefcc6f87cfeb 100644
>--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>@@ -2423,9 +2423,9 @@ void GraphicsLayerCA::updateCoverage(const CommitState& commitState)
>                 
>                 return "has transform animation with unknown extent";
>             };
>-            LOG_WITH_STREAM(Compositing, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " setBackingStoreAttached: " << requiresBacking << " (" << reasonForBacking() << ")");
>+            LOG_WITH_STREAM(Layers, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " setBackingStoreAttached: " << requiresBacking << " (" << reasonForBacking() << ")");
>         } else
>-            LOG_WITH_STREAM(Compositing, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " setBackingStoreAttached: " << requiresBacking);
>+            LOG_WITH_STREAM(Layers, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " setBackingStoreAttached: " << requiresBacking);
> #endif
> 
>         m_layer->setBackingStoreAttached(requiresBacking);
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index 0f2c4b16e531f8fcca411a30c654324f86af9dd6..94f86ac00760464b8ffee55b32023174f341def3 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -276,6 +276,11 @@ static inline bool compositingLogEnabled()
> {
>     return LogCompositing.state == WTFLogChannelState::On;
> }
>+
>+static inline bool layersLogEnabled()
>+{
>+    return LogLayers.state == WTFLogChannelState::On;
>+}
> #endif
> 
> RenderLayerCompositor::RenderLayerCompositor(RenderView& renderView)
>@@ -492,7 +497,7 @@ void RenderLayerCompositor::flushPendingLayerChanges(bool isFlushRoot)
>     // As long as we're not the root of the flush, we can bail.
>     if (!isFlushRoot && rootLayerAttachment() == RootLayerAttachedViaEnclosingFrame)
>         return;
>-    
>+
>     if (rootLayerAttachment() == RootLayerUnattached) {
> #if PLATFORM(IOS_FAMILY)
>         startLayerFlushTimerIfNeeded();
>@@ -515,6 +520,13 @@ void RenderLayerCompositor::flushPendingLayerChanges(bool isFlushRoot)
>         }
>         
>         ASSERT(m_flushingLayers);
>+
>+#if ENABLE(TREE_DEBUGGING)
>+        if (layersLogEnabled()) {
>+            LOG(Layers, "RenderLayerCompositor::flushPendingLayerChanges");
>+            showGraphicsLayerTree(m_rootContentsLayer.get());
>+        }
>+#endif
>     }
> 
> #if PLATFORM(IOS_FAMILY)
>@@ -806,8 +818,6 @@ bool RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update
>     if (compositingLogEnabled()) {
>         LOG(Compositing, "RenderLayerCompositor::updateCompositingLayers - post");
>         showPaintOrderTree(m_renderView.layer());
>-        LOG(Compositing, "RenderLayerCompositor::updateCompositingLayers - GraphicsLayers post, contentLayersCount %d", m_contentLayersCount);
>-        showGraphicsLayerTree(m_rootContentsLayer.get());
>     }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197345: 368405