Bustage fix (bug 804991 - Make FromContent expect a non-null pointer and add FromContentOrNull)

--HG--
extra : rebase_source : e7185c02b8cebd76201670f874d7c5b35bea9eb4
This commit is contained in:
Peter Van der Beken 2012-11-09 22:10:06 +01:00
parent cbb215838f
commit 5cfa8e4744

View File

@ -4511,13 +4511,15 @@ nsLayoutUtils::SurfaceFromElement(dom::Element* aElement,
uint32_t aSurfaceFlags)
{
// If it's a <canvas>, we may be able to just grab its internal surface
if (nsHTMLCanvasElement* canvas = nsHTMLCanvasElement::FromContent(aElement)) {
if (nsHTMLCanvasElement* canvas =
nsHTMLCanvasElement::FromContentOrNull(aElement)) {
return SurfaceFromElement(canvas, aSurfaceFlags);
}
#ifdef MOZ_MEDIA
// Maybe it's <video>?
if (nsHTMLVideoElement* video = nsHTMLVideoElement::FromContent(aElement)) {
if (nsHTMLVideoElement* video =
nsHTMLVideoElement::FromContentOrNull(aElement)) {
return SurfaceFromElement(video, aSurfaceFlags);
}
#endif