Merge 86725

Source/WebCore/html/HTMLObjectElement.cpp

Index: Source/WebCore/html/HTMLObjectElement.cpp
===================================================================
--- Source/WebCore/html/HTMLObjectElement.cpp	(revision 87086)
+++ Source/WebCore/html/HTMLObjectElement.cpp	(working copy)
@@ -378,8 +378,8 @@
     if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->status() != CachedResource::LoadError) {
         m_serviceType = m_imageLoader->image()->response().mimeType();
         if (!isImageType()) {
-            // If we don't think we have an image type anymore, then ditch the image loader.
-            m_imageLoader.clear();        
+            // If we don't think we have an image type anymore, then clear the image from the loader.
+            m_imageLoader->setImage(0);        
             detach();
             attach();
             return;