Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderImageResource.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderImageResource.cpp b/src/third_party/WebKit/Source/core/rendering/RenderImageResource.cpp
index ffd1dc3..e551678 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderImageResource.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderImageResource.cpp
@@ -28,12 +28,10 @@
 #include "config.h"
 #include "core/rendering/RenderImageResource.h"
 
-#include "core/fetch/ImageResource.h"
-#include "core/platform/graphics/Image.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderObject.h"
 
-namespace WebCore {
+namespace blink {
 
 RenderImageResource::RenderImageResource()
     : m_renderer(0)
@@ -88,8 +86,7 @@ void RenderImageResource::resetAnimation()
 
     image()->resetAnimation();
 
-    if (!m_renderer->needsLayout())
-        m_renderer->repaint();
+    m_renderer->setShouldDoFullPaintInvalidation(true);
 }
 
 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContainerSize)
@@ -99,11 +96,6 @@ void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
         m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style()->effectiveZoom());
 }
 
-Image* RenderImageResource::nullImage()
-{
-    return Image::nullImage();
-}
-
 LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::SizeType type) const
 {
     if (!m_cachedImage)
@@ -114,4 +106,4 @@ LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::Si
     return size;
 }
 
-} // namespace WebCore
+} // namespace blink