Bustage fix (
bug 804991 - Make FromContent expect a non-null pointer and add FromContentOrNull)
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4506,23 +4506,25 @@ nsLayoutUtils::SurfaceFromElement(nsHTML
return result;
}
nsLayoutUtils::SurfaceFromElementResult
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
// Finally, check if it's a normal image
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(aElement);
if (!imageLoader) {