From d0147a863b872ecaa451ab0dce2a348760e99e2c Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 13 Jul 2011 10:14:36 +0100 Subject: Merge WebKit at branches/chromium/742 r89068: Initial merge by Git. Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48 --- Source/WebCore/platform/mac/HTMLConverter.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/mac') diff --git a/Source/WebCore/platform/mac/HTMLConverter.mm b/Source/WebCore/platform/mac/HTMLConverter.mm index c0b0ba2..80016fd 100644 --- a/Source/WebCore/platform/mac/HTMLConverter.mm +++ b/Source/WebCore/platform/mac/HTMLConverter.mm @@ -1753,7 +1753,8 @@ static NSFileWrapper *fileWrapperForElement(Element* element) const AtomicString& attr = element->getAttribute(srcAttr); if (!attr.isEmpty()) { NSURL *URL = element->document()->completeURL(attr); - wrapper = fileWrapperForURL(element->document()->loader(), URL); + if (DocumentLoader* loader = element->document()->loader()) + wrapper = fileWrapperForURL(loader, URL); } if (!wrapper) { RenderImage* renderer = toRenderImage(element->renderer()); -- cgit v1.1