Reland of Make LayoutImageResource::image() parameter explicit

third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

 /*
  * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
  * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
  * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
@@ skipping 65 matching lines @@
     }
 }
 
 void LayoutImageResource::resetAnimation()
 {
     ASSERT(m_layoutObject);
 
     if (!m_cachedImage)
         return;
 
-    image()->resetAnimation();
+    m_cachedImage->image()->resetAnimation();
 
     m_layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 void LayoutImageResource::setContainerSizeForLayoutObject(const IntSize& imageContainerSize)
 {
     ASSERT(m_layoutObject);
     if (m_cachedImage)
         m_cachedImage->setContainerSizeForLayoutObject(m_layoutObject, imageContainerSize, m_layoutObject->style()->effectiveZoom());
 }
 
 LayoutSize LayoutImageResource::getImageSize(float multiplier, ImageResource::SizeType type) const
 {
     if (!m_cachedImage)
         return LayoutSize();
     LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, multiplier, type);
     if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && size.height())
         size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());
     return size;
 }
 
+bool LayoutImageResource::maybeAnimated() const
+{
+    Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
+    return image->maybeAnimated();
+}
+
 } // namespace blink