diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h index 90e59fc25b65..9ebbd83ee661 100644 --- a/gfx/layers/ImageLayers.h +++ b/gfx/layers/ImageLayers.h @@ -78,8 +78,6 @@ class ImageLayer : public Layer { ImageLayer(LayerManager* aManager, void* aImplData); virtual ~ImageLayer(); void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; RefPtr mContainer; gfx::SamplingFilter mSamplingFilter; diff --git a/gfx/layers/LayerManager.h b/gfx/layers/LayerManager.h index 62e958b22027..2d2f1f4e977d 100644 --- a/gfx/layers/LayerManager.h +++ b/gfx/layers/LayerManager.h @@ -562,10 +562,6 @@ class LayerManager : public WindowRenderer { // used to implement Dump*() and Log*(). virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix); - // Print interesting information about this into layerscope packet. - // Internally used to implement Dump(). - virtual void DumpPacket(layerscope::LayersPacket* aPacket); - uint64_t mId; bool mInTransaction; diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp index 77122b69bec3..d15314bce378 100644 --- a/gfx/layers/Layers.cpp +++ b/gfx/layers/Layers.cpp @@ -1135,116 +1135,6 @@ void WriteSnapshotToDumpFile(Compositor* aCompositor, DrawTarget* aTarget) { } #endif -void Layer::Dump(std::stringstream& aStream, const char* aPrefix, - bool aDumpHtml, bool aSorted, - const Maybe& aGeometry) { -#ifdef MOZ_DUMP_PAINTING - nsCString layerId(Name()); - layerId.Append('-'); - layerId.AppendInt((uint64_t)this); -#endif - if (aDumpHtml) { - aStream << nsPrintfCString(R"(
  • "; - } - DumpSelf(aStream, aPrefix, aGeometry); - - if (aDumpHtml) { - aStream << ""; - } - - if (Layer* mask = GetMaskLayer()) { - aStream << nsPrintfCString("%s Mask layer:\n", aPrefix).get(); - nsAutoCString pfx(aPrefix); - pfx += " "; - mask->Dump(aStream, pfx.get(), aDumpHtml); - } - - for (size_t i = 0; i < GetAncestorMaskLayerCount(); i++) { - aStream << nsPrintfCString("%s Ancestor mask layer %d:\n", aPrefix, - uint32_t(i)) - .get(); - nsAutoCString pfx(aPrefix); - pfx += " "; - GetAncestorMaskLayerAt(i)->Dump(aStream, pfx.get(), aDumpHtml); - } - -#ifdef MOZ_DUMP_PAINTING - for (size_t i = 0; i < mExtraDumpInfo.Length(); i++) { - const nsCString& str = mExtraDumpInfo[i]; - aStream << aPrefix << " Info:\n" << str.get(); - } -#endif - - if (ContainerLayer* container = AsContainerLayer()) { - nsTArray children; - if (aSorted) { - children = container->SortChildrenBy3DZOrder( - ContainerLayer::SortMode::WITH_GEOMETRY); - } else { - for (Layer* l = container->GetFirstChild(); l; l = l->GetNextSibling()) { - children.AppendElement(LayerPolygon(l)); - } - } - nsAutoCString pfx(aPrefix); - pfx += " "; - if (aDumpHtml) { - aStream << "
      "; - } - - for (LayerPolygon& child : children) { - child.data->Dump(aStream, pfx.get(), aDumpHtml, aSorted, child.geometry); - } - - if (aDumpHtml) { - aStream << "
    "; - } - } - - if (aDumpHtml) { - aStream << "
    • "; - } -} - -static void DumpGeometry(std::stringstream& aStream, - const Maybe& aGeometry) { - aStream << " [geometry=["; - - const nsTArray& points = aGeometry->GetPoints(); - for (size_t i = 0; i < points.Length(); ++i) { - const gfx::IntPoint point = TruncatedToInt(points[i].As2DPoint()); - aStream << point; - if (i != points.Length() - 1) { - aStream << ","; - } - } - - aStream << "]]"; -} - -void Layer::DumpSelf(std::stringstream& aStream, const char* aPrefix, - const Maybe& aGeometry) { - PrintInfo(aStream, aPrefix); - - if (aGeometry) { - DumpGeometry(aStream, aGeometry); - } - - aStream << "\n"; -} - -void Layer::Dump(layerscope::LayersPacket* aPacket, const void* aParent) { - DumpPacket(aPacket, aParent); - - if (Layer* kid = GetFirstChild()) { - kid->Dump(aPacket, this); - } - - if (Layer* next = GetNextSibling()) { - next->Dump(aPacket, aParent); - } -} - void Layer::SetDisplayListLog(const char* log) { if (gfxUtils::DumpDisplayList()) { mDisplayListLog = log; @@ -1428,134 +1318,6 @@ void Layer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -// The static helper function sets the transform matrix into the packet -static void DumpTransform(layerscope::LayersPacket::Layer::Matrix* aLayerMatrix, - const Matrix4x4& aMatrix) { - aLayerMatrix->set_is2d(aMatrix.Is2D()); - if (aMatrix.Is2D()) { - Matrix m = aMatrix.As2D(); - aLayerMatrix->set_isid(m.IsIdentity()); - if (!m.IsIdentity()) { - aLayerMatrix->add_m(m._11); - aLayerMatrix->add_m(m._12); - aLayerMatrix->add_m(m._21); - aLayerMatrix->add_m(m._22); - aLayerMatrix->add_m(m._31); - aLayerMatrix->add_m(m._32); - } - } else { - aLayerMatrix->add_m(aMatrix._11); - aLayerMatrix->add_m(aMatrix._12); - aLayerMatrix->add_m(aMatrix._13); - aLayerMatrix->add_m(aMatrix._14); - aLayerMatrix->add_m(aMatrix._21); - aLayerMatrix->add_m(aMatrix._22); - aLayerMatrix->add_m(aMatrix._23); - aLayerMatrix->add_m(aMatrix._24); - aLayerMatrix->add_m(aMatrix._31); - aLayerMatrix->add_m(aMatrix._32); - aLayerMatrix->add_m(aMatrix._33); - aLayerMatrix->add_m(aMatrix._34); - aLayerMatrix->add_m(aMatrix._41); - aLayerMatrix->add_m(aMatrix._42); - aLayerMatrix->add_m(aMatrix._43); - aLayerMatrix->add_m(aMatrix._44); - } -} - -// The static helper function sets the IntRect into the packet -template -static void DumpRect(layerscope::LayersPacket::Layer::Rect* aLayerRect, - const BaseRect& aRect) { - aLayerRect->set_x(aRect.X()); - aLayerRect->set_y(aRect.Y()); - aLayerRect->set_w(aRect.Width()); - aLayerRect->set_h(aRect.Height()); -} - -// The static helper function sets the nsIntRegion into the packet -static void DumpRegion(layerscope::LayersPacket::Layer::Region* aLayerRegion, - const nsIntRegion& aRegion) { - for (auto iter = aRegion.RectIter(); !iter.Done(); iter.Next()) { - DumpRect(aLayerRegion->add_r(), iter.Get()); - } -} - -void Layer::DumpPacket(layerscope::LayersPacket* aPacket, const void* aParent) { - // Add a new layer (UnknownLayer) - using namespace layerscope; - LayersPacket::Layer* layer = aPacket->add_layer(); - // Basic information - layer->set_type(LayersPacket::Layer::UnknownLayer); - layer->set_ptr(reinterpret_cast(this)); - layer->set_parentptr(reinterpret_cast(aParent)); - // Clip - if (mClipRect) { - DumpRect(layer->mutable_clip(), *mClipRect); - } - // Transform - if (!GetBaseTransform().IsIdentity()) { - DumpTransform(layer->mutable_transform(), GetBaseTransform()); - } - // Visible region - if (!mVisibleRegion.ToUnknownRegion().IsEmpty()) { - DumpRegion(layer->mutable_vregion(), mVisibleRegion.ToUnknownRegion()); - } - // EventRegions - if (!mEventRegions.IsEmpty()) { - const EventRegions& e = mEventRegions; - if (!e.mHitRegion.IsEmpty()) { - DumpRegion(layer->mutable_hitregion(), e.mHitRegion); - } - if (!e.mDispatchToContentHitRegion.IsEmpty()) { - DumpRegion(layer->mutable_dispatchregion(), - e.mDispatchToContentHitRegion); - } - if (!e.mNoActionRegion.IsEmpty()) { - DumpRegion(layer->mutable_noactionregion(), e.mNoActionRegion); - } - if (!e.mHorizontalPanRegion.IsEmpty()) { - DumpRegion(layer->mutable_hpanregion(), e.mHorizontalPanRegion); - } - if (!e.mVerticalPanRegion.IsEmpty()) { - DumpRegion(layer->mutable_vpanregion(), e.mVerticalPanRegion); - } - } - // Opacity - layer->set_opacity(GetOpacity()); - // Content opaque - layer->set_copaque(static_cast(GetContentFlags() & CONTENT_OPAQUE)); - // Component alpha - layer->set_calpha( - static_cast(GetContentFlags() & CONTENT_COMPONENT_ALPHA)); - // Vertical or horizontal bar - if (GetScrollbarData().mScrollbarLayerType == - layers::ScrollbarLayerType::Thumb) { - layer->set_direct(*GetScrollbarData().mDirection == - ScrollDirection::eVertical - ? LayersPacket::Layer::VERTICAL - : LayersPacket::Layer::HORIZONTAL); - layer->set_barid(GetScrollbarData().mTargetViewId); - } - - // Mask layer - if (mMaskLayer) { - layer->set_mask(reinterpret_cast(mMaskLayer.get())); - } - - // DisplayList log. - if (mDisplayListLog.Length() > 0) { - layer->set_displaylistloglength(mDisplayListLog.Length()); - auto compressedData = - MakeUnique(LZ4::maxCompressedSize(mDisplayListLog.Length())); - int compressedSize = - LZ4::compress((char*)mDisplayListLog.get(), mDisplayListLog.Length(), - compressedData.get()); - layer->set_displaylistlog(compressedData.get(), compressedSize); - } -} - bool Layer::IsBackfaceHidden() { if (GetContentFlags() & CONTENT_BACKFACE_HIDDEN) { Layer* container = AsContainerLayer() ? this : GetParent(); @@ -1585,20 +1347,6 @@ void PaintedLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -void PaintedLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::PaintedLayer); - nsIntRegion validRegion = GetValidRegion(); - if (!validRegion.IsEmpty()) { - DumpRegion(layer->mutable_valid(), validRegion); - } -} - void ContainerLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { Layer::PrintInfo(aStream, aPrefix); @@ -1613,32 +1361,11 @@ void ContainerLayer::PrintInfo(std::stringstream& aStream, .get(); } -void ContainerLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::ContainerLayer); -} - void ColorLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { Layer::PrintInfo(aStream, aPrefix); aStream << " [color=" << mColor << "] [bounds=" << mBounds << "]"; } -void ColorLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::ColorLayer); - layer->set_color(mColor.ToABGR()); -} - CanvasLayer::CanvasLayer(LayerManager* aManager, void* aImplData) : Layer(aManager, aImplData), mSamplingFilter(SamplingFilter::GOOD) {} @@ -1651,38 +1378,6 @@ void CanvasLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -// This help function is used to assign the correct enum value -// to the packet -static void DumpFilter(layerscope::LayersPacket::Layer* aLayer, - const SamplingFilter& aSamplingFilter) { - using namespace layerscope; - switch (aSamplingFilter) { - case SamplingFilter::GOOD: - aLayer->set_filter(LayersPacket::Layer::FILTER_GOOD); - break; - case SamplingFilter::LINEAR: - aLayer->set_filter(LayersPacket::Layer::FILTER_LINEAR); - break; - case SamplingFilter::POINT: - aLayer->set_filter(LayersPacket::Layer::FILTER_POINT); - break; - default: - // ignore it - break; - } -} - -void CanvasLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::CanvasLayer); - DumpFilter(layer, mSamplingFilter); -} - RefPtr CanvasLayer::CreateOrGetCanvasRenderer() { if (!mCanvasRenderer) { mCanvasRenderer = CreateCanvasRendererInternal(); @@ -1698,17 +1393,6 @@ void ImageLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -void ImageLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::ImageLayer); - DumpFilter(layer, mSamplingFilter); -} - void RefLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { ContainerLayer::PrintInfo(aStream, aPrefix); if (mId.IsValid()) { @@ -1722,17 +1406,6 @@ void RefLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -void RefLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::RefLayer); - layer->set_refid(uint64_t(mId)); -} - void ReadbackLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { Layer::PrintInfo(aStream, aPrefix); aStream << " [size=" << mSize << "]"; @@ -1747,72 +1420,9 @@ void ReadbackLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix) { } } -void ReadbackLayer::DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) { - Layer::DumpPacket(aPacket, aParent); - // Get this layer data - using namespace layerscope; - LayersPacket::Layer* layer = - aPacket->mutable_layer(aPacket->layer_size() - 1); - layer->set_type(LayersPacket::Layer::ReadbackLayer); - LayersPacket::Layer::Size* size = layer->mutable_size(); - size->set_w(mSize.width); - size->set_h(mSize.height); -} - //-------------------------------------------------- // LayerManager -void LayerManager::Dump(std::stringstream& aStream, const char* aPrefix, - bool aDumpHtml, bool aSorted) { -#ifdef MOZ_DUMP_PAINTING - if (aDumpHtml) { - aStream << "
    • "; - } -#endif - DumpSelf(aStream, aPrefix, aSorted); - - nsAutoCString pfx(aPrefix); - pfx += " "; - if (!GetRoot()) { - aStream << nsPrintfCString("%s(null)\n", pfx.get()).get(); - if (aDumpHtml) { - aStream << "
    "; - } - return; - } - - if (aDumpHtml) { - aStream << "
      "; - } - GetRoot()->Dump(aStream, pfx.get(), aDumpHtml, aSorted); - if (aDumpHtml) { - aStream << "
    "; - } - aStream << "\n"; -} - -void LayerManager::DumpSelf(std::stringstream& aStream, const char* aPrefix, - bool aSorted) { - PrintInfo(aStream, aPrefix); - aStream << " --- in " - << (aSorted ? "3D-sorted rendering order" : "content order"); - aStream << "\n"; -} - -void LayerManager::Dump(bool aSorted) { - std::stringstream ss; - Dump(ss, "", false, aSorted); - print_stderr(ss); -} - -void LayerManager::Dump(layerscope::LayersPacket* aPacket) { - DumpPacket(aPacket); - - if (GetRoot()) { - GetRoot()->Dump(aPacket, this); - } -} void LayerManager::Log(const char* aPrefix) { if (!IsLogEnabled()) return; @@ -1841,16 +1451,6 @@ void LayerManager::PrintInfo(std::stringstream& aStream, const char* aPrefix) { << nsPrintfCString("%sLayerManager (0x%p)", Name(), this).get(); } -void LayerManager::DumpPacket(layerscope::LayersPacket* aPacket) { - using namespace layerscope; - // Add a new layer data (LayerManager) - LayersPacket::Layer* layer = aPacket->add_layer(); - layer->set_type(LayersPacket::Layer::LayerManager); - layer->set_ptr(reinterpret_cast(this)); - // Layer Tree Root - layer->set_parentptr(0); -} - /*static*/ bool LayerManager::IsLogEnabled() { return MOZ_LOG_TEST(GetLog(), LogLevel::Debug); diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index 40e9596f209a..d75d5484c145 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -1037,25 +1037,6 @@ class Layer { void SetNextSibling(Layer* aSibling) { mNextSibling = aSibling; } void SetPrevSibling(Layer* aSibling) { mPrevSibling = aSibling; } - /** - * Dump information about this layer manager and its managed tree to - * aStream. - */ - void Dump(std::stringstream& aStream, const char* aPrefix = "", - bool aDumpHtml = false, bool aSorted = false, - const Maybe& aGeometry = Nothing()); - /** - * Dump information about just this layer manager itself to aStream. - */ - void DumpSelf(std::stringstream& aStream, const char* aPrefix = "", - const Maybe& aGeometry = Nothing()); - - /** - * Dump information about this layer and its child & sibling layers to - * layerscope packet. - */ - void Dump(layerscope::LayersPacket* aPacket, const void* aParent); - /** * Log information about this layer manager and its managed tree to * the NSPR log (if enabled for "Layers"). @@ -1074,12 +1055,6 @@ class Layer { // appends additional info to aTo. virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix); - // Just like PrintInfo, but this function dump information into layerscope - // packet, instead of a StringStream. It is also internally used to implement - // Dump(); - virtual void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent); - /** * Store display list log. */ @@ -1433,9 +1408,6 @@ class PaintedLayer : public Layer { void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - /** * ComputeEffectiveTransforms snaps the ideal transform to get * mEffectiveTransform. mResidualTranslation is the translation that should be @@ -1692,9 +1664,6 @@ class ContainerLayer : public Layer { virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - virtual void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - /** * True for if the container start a new 3D context extended by one * or more children. @@ -1768,9 +1737,6 @@ class ColorLayer : public Layer { void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - gfx::IntRect mBounds; gfx::DeviceColor mColor; }; @@ -1859,9 +1825,6 @@ class CanvasLayer : public Layer { void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - virtual RefPtr CreateCanvasRendererInternal() = 0; RefPtr mCanvasRenderer; @@ -2010,9 +1973,6 @@ class RefLayer : public ContainerLayer { void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - // 0 is a special value that means "no ID". LayersId mId; EventRegionsOverride mEventRegionsOverride; diff --git a/gfx/layers/ReadbackLayer.h b/gfx/layers/ReadbackLayer.h index 3dde7d0ac769..ea78b18f66e7 100644 --- a/gfx/layers/ReadbackLayer.h +++ b/gfx/layers/ReadbackLayer.h @@ -171,9 +171,6 @@ class ReadbackLayer : public Layer { virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) override; - virtual void DumpPacket(layerscope::LayersPacket* aPacket, - const void* aParent) override; - uint64_t mSequenceCounter; UniquePtr mSink; gfx::IntSize mSize;