Merge 128654

Source/WebCore/html/HTMLObjectElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 87 matching lines @@
 {
     if (attribute.name() == formAttr)
         formAttributeChanged();
     else if (attribute.name() == typeAttr) {
         m_serviceType = attribute.value().lower();
         size_t pos = m_serviceType.find(";");
         if (pos != notFound)
             m_serviceType = m_serviceType.left(pos);
         if (renderer())
             setNeedsWidgetUpdate(true);
-        if (!isImageType() && m_imageLoader)
-            m_imageLoader.clear();
     } else if (attribute.name() == dataAttr) {
         m_url = stripLeadingAndTrailingHTMLSpaces(attribute.value());
         if (renderer()) {
             setNeedsWidgetUpdate(true);
             if (isImageType()) {
                 if (!m_imageLoader)
                     m_imageLoader = adoptPtr(new HTMLImageLoader(this));
                 m_imageLoader->updateFromElementIgnoringPreviousError();
             }
         }
@@ skipping 393 matching lines @@
     return getURLAttribute(dataAttr);
 }
 
 void HTMLObjectElement::setItemValueText(const String& value, ExceptionCode&)
 {
     setAttribute(dataAttr, value);
 }
 #endif
 
 }