Bug 1306234 - Back out changeset f7aeb4b3ccb1 (bug 1279398) for causing top crashes. r=edwin

--HG--
extra : rebase_source : 24aee74e09242f1cae18a1df48654268a2e91769
This commit is contained in:
Edwin Flores 2016-09-27 19:52:17 +01:00
parent 792cfa85a2
commit 2e88e8e508
2 changed files with 19 additions and 1 deletions

View File

@ -171,7 +171,7 @@ gfxASurface::Wrap (cairo_surface_t *csurf, const IntSize& aSize)
}
#endif
else {
MOZ_CRASH("Unknown cairo surface type");
result = new gfxUnknownSurface(csurf, aSize);
}
// fprintf(stderr, "New wrapper for %p -> %p\n", csurf, result);

View File

@ -183,4 +183,22 @@ protected:
bool mSurfaceValid;
};
/**
* An Unknown surface; used to wrap unknown cairo_surface_t returns from cairo
*/
class gfxUnknownSurface : public gfxASurface {
public:
gfxUnknownSurface(cairo_surface_t *surf, const mozilla::gfx::IntSize& aSize)
: mSize(aSize)
{
Init(surf, true);
}
virtual ~gfxUnknownSurface() { }
virtual const mozilla::gfx::IntSize GetSize() const override { return mSize; }
private:
mozilla::gfx::IntSize mSize;
};
#endif /* GFX_ASURFACE_H */