Bug 1373012 - Log the clip mask indices in the layers dump. r?mstange draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 14 Jun 2017 15:18:16 -0400
changeset 594262 a5190c2a0902a102ba0d287907b42a6746cd5841
parent 594149 da66c4a05fda49d457d9411a7092fed87cf9e53a
child 633367 23b478c7de35a2de530e048b46c8088b3921cee2
push id63968
push userkgupta@mozilla.com
push dateWed, 14 Jun 2017 19:18:30 +0000
reviewersmstange
bugs1373012
milestone56.0a1
Bug 1373012 - Log the clip mask indices in the layers dump. r?mstange MozReview-Commit-ID: HmwDyV4Pga0
gfx/layers/Layers.cpp
gfx/layers/LayersLogging.cpp
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -1845,16 +1845,19 @@ Layer::PrintInfo(std::stringstream& aStr
 
   layers::PrintInfo(aStream, AsHostLayer());
 
   if (mClipRect) {
     AppendToString(aStream, *mClipRect, " [clip=", "]");
   }
   if (mSimpleAttrs.ScrolledClip()) {
     AppendToString(aStream, mSimpleAttrs.ScrolledClip()->GetClipRect(), " [scrolled-clip=", "]");
+    if (const Maybe<size_t>& ix = mSimpleAttrs.ScrolledClip()->GetMaskLayerIndex()) {
+      AppendToString(aStream, ix.value(), " [scrolled-mask=", "]");
+    }
   }
   if (1.0 != mSimpleAttrs.PostXScale() || 1.0 != mSimpleAttrs.PostYScale()) {
     aStream << nsPrintfCString(" [postScale=%g, %g]", mSimpleAttrs.PostXScale(), mSimpleAttrs.PostYScale()).get();
   }
   if (!GetBaseTransform().IsIdentity()) {
     AppendToString(aStream, GetBaseTransform(), " [transform=", "]");
   }
   if (!GetEffectiveTransform().IsIdentity()) {
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -165,16 +165,19 @@ AppendToString(std::stringstream& aStrea
   AppendToString(aStream, m.GetMetrics(), "{ [metrics=");
   AppendToString(aStream, m.GetBackgroundColor(), "] [color=");
   if (m.GetScrollParentId() != FrameMetrics::NULL_SCROLL_ID) {
     AppendToString(aStream, m.GetScrollParentId(), "] [scrollParent=");
   }
   if (m.HasScrollClip()) {
     AppendToString(aStream, m.ScrollClip().GetClipRect(), "] [clip=");
   }
+  if (m.HasMaskLayer()) {
+    AppendToString(aStream, m.ScrollClip().GetMaskLayerIndex().value(), "] [mask=");
+  }
   aStream << "] }" << sfx;
 }
 
 void
 AppendToString(std::stringstream& aStream, const FrameMetrics& m,
                const char* pfx, const char* sfx, bool detailed)
 {
   aStream << pfx;