Reland of Make LayoutImageResource::image() parameter explicit

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

Index: third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
index 85e24d61d56493228c2276e38b94076d114c9807..4c4ceb9546f712360ef16e57b4015ed70190d999 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp
@@ -83,7 +83,7 @@
     if (!m_cachedImage)
         return;
 
-    image()->resetAnimation();
+    m_cachedImage->image()->resetAnimation();
 
     m_layoutObject->setShouldDoFullPaintInvalidation();
 }
@@ -105,4 +105,10 @@
     return size;
 }
 
+bool LayoutImageResource::maybeAnimated() const
+{
+    Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
+    return image->maybeAnimated();
+}
+
 } // namespace blink