WebKit Bugzilla
Attachment 372144 Details for
Bug 198870
: Make layerTreeAsText() output a bit less verbose
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198870-20190614145118.patch (text/plain), 23.26 KB, created by
Simon Fraser (smfr)
on 2019-06-14 14:51:20 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2019-06-14 14:51:20 PDT
Size:
23.26 KB
patch
obsolete
>Subversion Revision: 246331 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index b72163a079b2c2a8f08a5dc59a00a7ad6f0e2f58..57958ff3e0030cafe9430be1495e78987ebed80f 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,21 @@ >+2019-06-14 Simon Fraser <simon.fraser@apple.com> >+ >+ Make layerTreeAsText() output a bit less verbose >+ https://bugs.webkit.org/show_bug.cgi?id=198870 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ "accelerates drawing" was getting dumped twice for debug dumps. >+ Only dump the non-default state for "uses display-list drawing". >+ Use the new OptionSet<> dumping for GraphicsLayerPaintingPhases. >+ >+ * platform/graphics/GraphicsLayer.cpp: >+ (WebCore::GraphicsLayer::dumpProperties const): >+ (WebCore::operator<<): >+ * platform/graphics/GraphicsLayer.h: >+ * platform/graphics/ca/GraphicsLayerCA.cpp: >+ (WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes): >+ > 2019-06-11 Michael Catanzaro <mcatanzaro@igalia.com> > > Unreviewed build warning fixes >diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.cpp b/Source/WebCore/platform/graphics/GraphicsLayer.cpp >index 64ec3cafcf03a6aee0fc09bb3e916e542e5a7e28..264af0b993420e976d09fe315d72b4c3df804d05 100644 >--- a/Source/WebCore/platform/graphics/GraphicsLayer.cpp >+++ b/Source/WebCore/platform/graphics/GraphicsLayer.cpp >@@ -918,10 +918,8 @@ void GraphicsLayer::dumpProperties(TextStream& ts, LayerTreeAsTextBehavior behav > if (!m_backfaceVisibility) > ts << indent << "(backfaceVisibility " << (m_backfaceVisibility ? "visible" : "hidden") << ")\n"; > >- if (behavior & LayerTreeAsTextDebug) { >+ if (behavior & LayerTreeAsTextDebug) > ts << indent << "(primary-layer-id " << primaryLayerID() << ")\n"; >- ts << indent << "(client " << static_cast<void*>(m_client) << ")\n"; >- } > > if (m_backgroundColor.isValid() && client().shouldDumpPropertyForLayer(this, "backgroundColor", behavior)) > ts << indent << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n"; >@@ -999,29 +997,8 @@ void GraphicsLayer::dumpProperties(TextStream& ts, LayerTreeAsTextBehavior behav > ts << indent << ")\n"; > } > >- if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase()) { >- ts << indent << "(paintingPhases\n"; >- TextStream::IndentScope indentScope(ts); >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Background)) >- ts << indent << "GraphicsLayerPaintBackground\n"; >- >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Foreground)) >- ts << indent << "GraphicsLayerPaintForeground\n"; >- >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Mask)) >- ts << indent << "GraphicsLayerPaintMask\n"; >- >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::ChildClippingMask)) >- ts << indent << "GraphicsLayerPaintChildClippingMask\n"; >- >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::OverflowContents)) >- ts << indent << "GraphicsLayerPaintOverflowContents\n"; >- >- if (paintingPhase().contains(GraphicsLayerPaintingPhase::CompositedScroll)) >- ts << indent << "GraphicsLayerPaintCompositedScroll\n"; >- >- ts << indent << ")\n"; >- } >+ if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase()) >+ ts << indent << "(paintingPhases " << paintingPhase() << ")\n"; > > dumpAdditionalProperties(ts, behavior); > >@@ -1051,7 +1028,22 @@ TextStream& operator<<(TextStream& ts, const Vector<GraphicsLayer::PlatformLayer > return ts; > } > >-TextStream& operator<<(TextStream& ts, const WebCore::GraphicsLayer::CustomAppearance& customAppearance) >+TextStream& operator<<(TextStream& ts, GraphicsLayerPaintingPhase phase) >+{ >+ switch (phase) { >+ case GraphicsLayerPaintingPhase::Background: ts << "background"; break; >+ case GraphicsLayerPaintingPhase::Foreground: ts << "foreground"; break; >+ case GraphicsLayerPaintingPhase::Mask: ts << "mask"; break; >+ case GraphicsLayerPaintingPhase::ClipPath: ts << "clip-path"; break; >+ case GraphicsLayerPaintingPhase::OverflowContents: ts << "overflow-contents"; break; >+ case GraphicsLayerPaintingPhase::CompositedScroll: ts << "composited-scroll"; break; >+ case GraphicsLayerPaintingPhase::ChildClippingMask: ts << "child-clipping-mask"; break; >+ } >+ >+ return ts; >+} >+ >+TextStream& operator<<(TextStream& ts, const GraphicsLayer::CustomAppearance& customAppearance) > { > switch (customAppearance) { > case GraphicsLayer::CustomAppearance::None: ts << "none"; break; >diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h >index 2fc85f5d46b16e244658a9d89881a0c904c23cf0..e3957169e3374a6f5841ef0346f23db98b637668 100644 >--- a/Source/WebCore/platform/graphics/GraphicsLayer.h >+++ b/Source/WebCore/platform/graphics/GraphicsLayer.h >@@ -741,6 +741,7 @@ protected: > #endif > }; > >+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const WebCore::GraphicsLayerPaintingPhase); > WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const Vector<GraphicsLayer::PlatformLayerID>&); > WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const GraphicsLayer::CustomAppearance&); > >diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp >index 3ca5c5ca1778289e587810f66dc7a7d7ac2e5ccd..08dd5910eac4548b6a95e27d07ea1a0665ce1bc6 100644 >--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp >+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp >@@ -3726,11 +3726,10 @@ void GraphicsLayerCA::dumpAdditionalProperties(TextStream& textStream, LayerTree > > textStream << indent << "(in window " << tiledBacking()->isInWindow() << ")\n"; > } >- >+ > if (m_layer->wantsDeepColorBackingStore()) > textStream << indent << "(deep color 1)\n"; > >- > if (behavior & LayerTreeAsTextIncludeContentLayers) { > dumpInnerLayer(textStream, "structural layer", m_structuralLayer.get(), behavior); > dumpInnerLayer(textStream, "contents clipping layer", m_contentsClippingLayer.get(), behavior); >@@ -3742,8 +3741,8 @@ void GraphicsLayerCA::dumpAdditionalProperties(TextStream& textStream, LayerTree > } > > if (behavior & LayerTreeAsTextDebug) { >- textStream << indent << "(accelerates drawing " << m_acceleratesDrawing << ")\n"; >- textStream << indent << "(uses display-list drawing " << m_usesDisplayListDrawing << ")\n"; >+ if (m_usesDisplayListDrawing) >+ textStream << indent << "(uses display-list drawing " << m_usesDisplayListDrawing << ")\n"; > } > } > >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 2e0e8b397c34dd9de4e9c72b0743e2fb279238f5..03bad4a4b30f8a579e9598436b328595db486ec2 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,16 @@ >+2019-06-14 Simon Fraser <simon.fraser@apple.com> >+ >+ Make layerTreeAsText() output a bit less verbose >+ https://bugs.webkit.org/show_bug.cgi?id=198870 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt: >+ * platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt: >+ * platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt: >+ * platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt: >+ * platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt: Removed. >+ > 2019-06-11 Daniel Bates <dabates@apple.com> > > Import Content Security Policy Web Platform Tests >diff --git a/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt b/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >index 63099dcaaa04c96eafde443f22d49b7ffbfe3787..aee31657640a54e8f3f0ed158c3f730719efd318 100644 >--- a/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >+++ b/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >@@ -2,27 +2,18 @@ Scrolled contents > (GraphicsLayer > (anchor 0.00 0.00) > (bounds 800.00 600.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (bounds 800.00 600.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (position 8.00 8.00) > (bounds 322.00 322.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [background, composited-scroll]) > (children 1 > (GraphicsLayer > (offsetFromRenderer width=1 height=1) >@@ -34,28 +25,19 @@ Scrolled contents > (anchor 0.00 0.00) > (bounds 305.00 1020.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintOverflowContents >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [overflow-contents, composited-scroll]) > (children 2 > (GraphicsLayer > (position 30.00 50.00) > (bounds 100.00 100.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (bounds 305.00 1020.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintForeground >- GraphicsLayerPaintOverflowContents >- ) >+ (paintingPhases [foreground, overflow-contents]) > ) > ) > ) >diff --git a/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt b/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt >index f2c4d6286b8a2ee7d9a9a6119971376de5817146..d6aaf5e399f0abc44c4cbdafef78e4eff2a11030 100644 >--- a/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt >+++ b/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt >@@ -1,62 +1,42 @@ > (GraphicsLayer > (anchor 0.00 0.00) > (bounds 800.00 600.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (bounds 800.00 600.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (position 28.00 20.00) > (bounds 202.00 202.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [background, foreground]) > (children 4 > (GraphicsLayer > (offsetFromRenderer width=-1 height=-1) > (position 1.00 1.00) > (bounds 185.00 185.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (bounds 185.00 715.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintOverflowContents >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [overflow-contents, composited-scroll]) > (children 2 > (GraphicsLayer > (position 0.00 10.00) > (bounds 80.00 10.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (bounds 185.00 715.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [foreground]) > ) > ) > ) >@@ -66,28 +46,19 @@ > (position 1.00 186.00) > (bounds 185.00 15.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (position 186.00 1.00) > (bounds 15.00 185.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (position 186.00 186.00) > (bounds 15.00 15.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > ) > ) >diff --git a/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt b/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >index fb55b1f1fb733f9e14ecaf2ca78430ae1b5a0a94..e580864c7dd7aed3d0fe87cfe89a4e2fdac85da9 100644 >--- a/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >+++ b/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >@@ -2,27 +2,18 @@ Scrolled contents > (GraphicsLayer > (anchor 0.00 0.00) > (bounds 800.00 600.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (bounds 800.00 600.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (position 8.00 8.00) > (bounds 322.00 322.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [background, composited-scroll]) > (children 1 > (GraphicsLayer > (offsetFromRenderer width=1 height=1) >@@ -34,28 +25,19 @@ Scrolled contents > (anchor 0.00 0.00) > (bounds 320.00 1020.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintOverflowContents >- GraphicsLayerPaintCompositedScroll >- ) >+ (paintingPhases [overflow-contents, composited-scroll]) > (children 2 > (GraphicsLayer > (position 30.00 50.00) > (bounds 100.00 100.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (bounds 320.00 1020.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintForeground >- GraphicsLayerPaintOverflowContents >- ) >+ (paintingPhases [foreground, overflow-contents]) > ) > ) > ) >diff --git a/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt b/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >index 78a95a75090fe3153fa91930fe1262630f3b8dc9..5efc75249e37ea11c946e2e3feaca7f4aa57eade 100644 >--- a/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >+++ b/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt >@@ -2,52 +2,36 @@ Scrolled contents > (GraphicsLayer > (anchor 0.00 0.00) > (bounds 800.00 600.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (bounds 800.00 600.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 1 > (GraphicsLayer > (position 8.00 8.00) > (bounds 322.00 322.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- ) >+ (paintingPhases [background]) > (children 1 > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (position 1.00 1.00) > (bounds 305.00 305.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > (children 2 > (GraphicsLayer > (position 30.00 50.00) > (bounds 100.00 100.00) > (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [background, foreground]) > ) > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (bounds 305.00 305.00) > (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintForeground >- ) >+ (paintingPhases [foreground]) > ) > ) > ) >diff --git a/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt b/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt >deleted file mode 100644 >index f2c4d6286b8a2ee7d9a9a6119971376de5817146..0000000000000000000000000000000000000000 >--- a/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt >+++ /dev/null >@@ -1,99 +0,0 @@ >-(GraphicsLayer >- (anchor 0.00 0.00) >- (bounds 800.00 600.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- (children 1 >- (GraphicsLayer >- (bounds 800.00 600.00) >- (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- (children 1 >- (GraphicsLayer >- (position 28.00 20.00) >- (bounds 202.00 202.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintCompositedScroll >- ) >- (children 4 >- (GraphicsLayer >- (offsetFromRenderer width=-1 height=-1) >- (position 1.00 1.00) >- (bounds 185.00 185.00) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- (children 1 >- (GraphicsLayer >- (offsetFromRenderer width=1 height=1) >- (bounds 185.00 715.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintOverflowContents >- GraphicsLayerPaintCompositedScroll >- ) >- (children 2 >- (GraphicsLayer >- (position 0.00 10.00) >- (bounds 80.00 10.00) >- (contentsOpaque 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- ) >- (GraphicsLayer >- (offsetFromRenderer width=1 height=1) >- (bounds 185.00 715.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintForeground >- ) >- ) >- ) >- ) >- ) >- ) >- (GraphicsLayer >- (position 1.00 186.00) >- (bounds 185.00 15.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- ) >- (GraphicsLayer >- (position 186.00 1.00) >- (bounds 15.00 185.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- ) >- (GraphicsLayer >- (position 186.00 186.00) >- (bounds 15.00 15.00) >- (drawsContent 1) >- (paintingPhases >- GraphicsLayerPaintBackground >- GraphicsLayerPaintForeground >- ) >- ) >- ) >- ) >- ) >- ) >- ) >-) >- >-
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198870
: 372144