Backed out changeset 64c58cb9c49b (bug 918078) for bustage

This commit is contained in:
Carsten "Tomcat" Book
2013-09-20 11:09:49 +02:00
parent c89b24c920
commit d68fc79787
2 changed files with 17 additions and 15 deletions

View File

@@ -161,20 +161,6 @@ TextureHost::~TextureHost()
{
}
#ifdef MOZ_LAYERS_HAVE_LOG
void
TextureHost::PrintInfo(nsACString& aTo, const char* aPrefix)
{
aTo += aPrefix;
aTo += nsPrintfCString("%s (0x%p)", Name(), this);
AppendToString(aTo, GetSize(), " [size=", "]");
AppendToString(aTo, GetFormat(), " [format=", "]");
AppendToString(aTo, mFlags, " [flags=", "]");
}
#endif
void TextureSource::SetCompositableQuirks(CompositableQuirks* aQuirks)
{
mQuirks = aQuirks;
@@ -245,6 +231,12 @@ DeprecatedTextureHost::SwapTextures(const SurfaceDescriptor& aImage,
}
#ifdef MOZ_LAYERS_HAVE_LOG
void
TextureSource::PrintInfo(nsACString& aTo, const char* aPrefix)
{
aTo += aPrefix;
aTo += nsPrintfCString("UnknownTextureSource (0x%p)", this);
}
void
DeprecatedTextureHost::PrintInfo(nsACString& aTo, const char* aPrefix)

View File

@@ -120,6 +120,10 @@ public:
virtual void SetCompositableQuirks(CompositableQuirks* aQuirks);
#ifdef MOZ_LAYERS_HAVE_LOG
virtual void PrintInfo(nsACString& aTo, const char* aPrefix);
#endif
protected:
RefPtr<CompositableQuirks> mQuirks;
};
@@ -385,7 +389,13 @@ public:
virtual void SetCompositableQuirks(CompositableQuirks* aQuirks);
#ifdef MOZ_LAYERS_HAVE_LOG
virtual void PrintInfo(nsACString& aTo, const char* aPrefix);
virtual void PrintInfo(nsACString& aTo, const char* aPrefix)
{
RefPtr<TextureSource> source = GetTextureSources();
if (source) {
source->PrintInfo(aTo, aPrefix);
}
}
#endif
protected: