Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1111258 - Bustage fix. r=mstange

Browse Source
This commit is contained in:
Benoit Girard 2014-12-16 21:32:58 -05:00
parent 9df23f9a1e
commit 11da062e2a
6 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/composite/CompositableHost.cpp
View File

@ -207,7 +207,6 @@ CompositableHost::Create(const TextureInfo& aTextureInfo)
return result;
}
#ifdef MOZ_DUMP_PAINTING
void
CompositableHost::DumpTextureHost(std::stringstream& aStream, TextureHost* aTexture)
{
@ -220,7 +219,6 @@ CompositableHost::DumpTextureHost(std::stringstream& aStream, TextureHost* aText
}
aStream << gfxUtils::GetAsLZ4Base64Str(dSurf).get();
}
#endif
namespace CompositableMap {

2
gfx/layers/composite/CompositableHost.h
View File

@ -216,14 +216,12 @@ public:
}
bool IsAttached() { return mAttached; }
#ifdef MOZ_DUMP_PAINTING
virtual void Dump(std::stringstream& aStream,
const char* aPrefix="",
bool aDumpHtml=false) { }
static void DumpTextureHost(std::stringstream& aStream, TextureHost* aTexture);
virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() { return nullptr; }
#endif
virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) = 0;

3
gfx/layers/composite/ContentHost.cpp
View File

@ -878,7 +878,6 @@ ContentHostIncremental::GenEffect(const gfx::Filter& aFilter)
return CreateTexturedEffect(mSource, mSourceOnWhite, aFilter, true);
}
#ifdef MOZ_DUMP_PAINTING
TemporaryRef<gfx::DataSourceSurface>
ContentHostTexture::GetAsSurface()
{
@ -889,8 +888,6 @@ ContentHostTexture::GetAsSurface()
return mTextureHost->GetAsSurface();
}
#endif
} // namespace
} // namespace

3
gfx/layers/composite/ContentHost.h
View File

@ -132,7 +132,8 @@ public:
virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() MOZ_OVERRIDE;
virtual void Dump(std::stringstream& aStream,
const char* aPrefix="") MOZ_OVERRIDE;
const char* aPrefix="",
bool aDumpHtml=false) MOZ_OVERRIDE;
virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) MOZ_OVERRIDE;

4
gfx/layers/composite/ImageHost.cpp
View File

@ -217,7 +217,6 @@ ImageHost::PrintInfo(std::stringstream& aStream, const char* aPrefix)
}
}
#ifdef MOZ_DUMP_PAINTING
void
ImageHost::Dump(std::stringstream& aStream,
const char* aPrefix,
@ -231,7 +230,6 @@ ImageHost::Dump(std::stringstream& aStream,
aStream << (aDumpHtml ? " </li></ul> " : " ");
}
}
#endif
LayerRenderState
ImageHost::GetRenderState()
@ -242,13 +240,11 @@ ImageHost::GetRenderState()
return LayerRenderState();
}
#ifdef MOZ_DUMP_PAINTING
TemporaryRef<gfx::DataSourceSurface>
ImageHost::GetAsSurface()
{
return mFrontBuffer->GetAsSurface();
}
#endif
bool
ImageHost::Lock()

2
gfx/layers/composite/ImageHost.h
View File

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