Bug 1111258 - Allow dumping textures without MOZ_DUMP_PAINTING. r=mstange

This commit is contained in:
Benoit Girard 2014-12-16 18:39:43 -05:00
parent b9779d70ee
commit 4e796449a7
4 changed files with 3 additions and 12 deletions

View File

@ -255,12 +255,12 @@ ContentHostTexture::SetCompositor(Compositor* aCompositor)
}
}
#ifdef MOZ_DUMP_PAINTING
void
ContentHostTexture::Dump(std::stringstream& aStream,
const char* aPrefix,
bool aDumpHtml)
{
#ifdef MOZ_DUMP_PAINTING
if (!aDumpHtml) {
return;
}
@ -278,8 +278,8 @@ ContentHostTexture::Dump(std::stringstream& aStream,
aStream << "> Front buffer on white </a> </li> ";
}
aStream << "</ul>";
}
#endif
}
static inline void
AddWrappedRegion(const nsIntRegion& aInput, nsIntRegion& aOutput,

View File

@ -129,13 +129,10 @@ public:
virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
#ifdef MOZ_DUMP_PAINTING
virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() MOZ_OVERRIDE;
virtual void Dump(std::stringstream& aStream,
const char* aPrefix="",
bool aDumpHtml=false) MOZ_OVERRIDE;
#endif
const char* aPrefix="") MOZ_OVERRIDE;
virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) MOZ_OVERRIDE;

View File

@ -629,17 +629,14 @@ TiledContentHost::PrintInfo(std::stringstream& aStream, const char* aPrefix)
aStream << aPrefix;
aStream << nsPrintfCString("TiledContentHost (0x%p)", this).get();
#ifdef MOZ_DUMP_PAINTING
if (gfxPrefs::LayersDumpTexture() || profiler_feature_active("layersdump")) {
nsAutoCString pfx(aPrefix);
pfx += " ";
Dump(aStream, pfx.get(), false);
}
#endif
}
#ifdef MOZ_DUMP_PAINTING
void
TiledContentHost::Dump(std::stringstream& aStream,
const char* aPrefix,
@ -678,7 +675,6 @@ TiledContentHost::Dump(std::stringstream& aStream,
x += w;
}
}
#endif
} // namespace
} // namespace

View File

@ -256,11 +256,9 @@ public:
virtual void Detach(Layer* aLayer = nullptr,
AttachFlags aFlags = NO_FLAGS) MOZ_OVERRIDE;
#ifdef MOZ_DUMP_PAINTING
virtual void Dump(std::stringstream& aStream,
const char* aPrefix="",
bool aDumpHtml=false) MOZ_OVERRIDE;
#endif
virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);