wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1036859 - Make gfxContext code assume there is always a DrawTarget. r=mstange

Browse Source
This commit is contained in:
Jonathan Watt 2014-07-11 08:06:38 +01:00
parent c885ba1f0b
commit abac46757a
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gfx/thebes/gfxContext.cpp
View File

@ -89,6 +89,8 @@ gfxContext::gfxContext(DrawTarget *aTarget, const Point& aDeviceOffset)
, mDT(aTarget)
, mOriginalDT(aTarget)
{
MOZ_ASSERT(aTarget, "Don't create a gfxContext without a DrawTarget");
MOZ_COUNT_CTOR(gfxContext);
mStateStack.SetLength(1);
@ -111,18 +113,16 @@ gfxContext::~gfxContext()
if (mRefCairo) {
cairo_destroy(mRefCairo);
}
if (mDT) {
for (int i = mStateStack.Length() - 1; i >= 0; i--) {
for (unsigned int c = 0; c < mStateStack[i].pushedClips.Length(); c++) {
mDT->PopClip();
}
if (mStateStack[i].clipWasReset) {
break;
}
for (int i = mStateStack.Length() - 1; i >= 0; i--) {
for (unsigned int c = 0; c < mStateStack[i].pushedClips.Length(); c++) {
mDT->PopClip();
}
if (mStateStack[i].clipWasReset) {
break;
}
mDT->Flush();
}
mDT->Flush();
MOZ_COUNT_DTOR(gfxContext);
}
@ -1027,9 +1027,6 @@ gfxContext::Mask(gfxASurface *surface, const gfxPoint& offset)
void
gfxContext::Mask(SourceSurface *surface, const Point& offset)
{
MOZ_ASSERT(mDT);
// We clip here to bind to the mask surface bounds, see above.
mDT->MaskSurface(GeneralPattern(this),
surface,
@ -1314,31 +1311,19 @@ gfxContext::RoundedRectangle(const gfxRect& rect,
void
gfxContext::WriteAsPNG(const char* aFile)
{
if (mDT) {
gfxUtils::WriteAsPNG(mDT, aFile);
} else {
NS_WARNING("No DrawTarget found!");
}
gfxUtils::WriteAsPNG(mDT, aFile);
}
void
gfxContext::DumpAsDataURI()
{
if (mDT) {
gfxUtils::DumpAsDataURI(mDT);
} else {
NS_WARNING("No DrawTarget found!");
}
gfxUtils::DumpAsDataURI(mDT);
}
void
gfxContext::CopyAsDataURI()
{
if (mDT) {
gfxUtils::CopyAsDataURI(mDT);
} else {
NS_WARNING("No DrawTarget found!");
}
gfxUtils::CopyAsDataURI(mDT);
}
#endif