Merge 128654

Source/WebCore/html/HTMLVideoElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 98 matching lines @@
     if (attribute.name() == posterAttr) {
         // Force a poster recalc by setting m_displayMode to Unknown directly before calling updateDisplayState.
         HTMLMediaElement::setDisplayMode(Unknown);
         updateDisplayState();
 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
         if (shouldDisplayPosterImage()) {
             if (!m_imageLoader)
                 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
             m_imageLoader->updateFromElementIgnoringPreviousError();
         } else {
-            if (m_imageLoader)
-                m_imageLoader.clear();
             if (renderer())
                 toRenderImage(renderer())->imageResource()->setCachedImage(0); 
         }
 #endif
     } else
         HTMLMediaElement::parseAttribute(attribute);
 }
 
 bool HTMLVideoElement::supportsFullscreen() const
 {
@@ skipping 169 matching lines @@
     if (!player())
         return 0;
 
     return player()->droppedFrameCount();
 }
 #endif
 
 }
 
 #endif