Re-land: Blink image-decoders: (lazy) deferred image decoding support for ICO

third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

 /*
  * Copyright (C) 2012 Google 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 58 matching lines @@
 {
     return adoptPtr(new DeferredImageDecoder(std::move(actualDecoder)));
 }
 
 DeferredImageDecoder::DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder)
     : m_allDataReceived(false)
     , m_actualDecoder(std::move(actualDecoder))
     , m_repetitionCount(cAnimationNone)
     , m_hasColorProfile(false)
     , m_canYUVDecode(false)
+    , m_hasHotSpot(false)
 {
 }
 
 DeferredImageDecoder::~DeferredImageDecoder()
 {
 }
 
 String DeferredImageDecoder::filenameExtension() const
 {
     return m_actualDecoder ? m_actualDecoder->filenameExtension() : m_filenameExtension;
@@ skipping 139 matching lines @@
         return m_frameData[index].m_orientation;
     return DefaultImageOrientation;
 }
 
 void DeferredImageDecoder::activateLazyDecoding()
 {
     if (m_frameGenerator)
         return;
 
     m_size = m_actualDecoder->size();
+    m_hasHotSpot = m_actualDecoder->hotSpot(m_hotSpot);
     m_filenameExtension = m_actualDecoder->filenameExtension();
     // JPEG images support YUV decoding: other decoders do not, WEBP could in future.
     m_canYUVDecode = RuntimeEnabledFeatures::decodeToYUVEnabled() && (m_filenameExtension == "jpg");
     m_hasColorProfile = m_actualDecoder->hasColorProfile();
 
     const bool isSingleFrame = m_actualDecoder->repetitionCount() == cAnimationNone || (m_allDataReceived && m_actualDecoder->frameCount() == 1u);
     const SkISize decodedSize = SkISize::Make(m_actualDecoder->decodedSize().width(), m_actualDecoder->decodedSize().height());
     m_frameGenerator = ImageFrameGenerator::create(decodedSize, !isSingleFrame);
 }
 
 void DeferredImageDecoder::prepareLazyDecodedFrames()
 {
     if (!m_actualDecoder
-        || !m_actualDecoder->isSizeAvailable()
-        || m_actualDecoder->filenameExtension() == "ico")
+        || !m_actualDecoder->isSizeAvailable())
         return;
 
     activateLazyDecoding();
 
     const size_t previousSize = m_frameData.size();
     m_frameData.resize(m_actualDecoder->frameCount());
 
     // We have encountered a broken image file. Simply bail.
     if (m_frameData.size() < previousSize)
         return;
@@ skipping 44 matching lines @@
         m_frameData[index].m_uniqueID = image->uniqueID();
     }
 
     generator->setCanYUVDecode(m_canYUVDecode);
 
     return image.release();
 }
 
 bool DeferredImageDecoder::hotSpot(IntPoint& hotSpot) const
 {
-    // TODO: Implement.
-    return m_actualDecoder ? m_actualDecoder->hotSpot(hotSpot) : false;
+    if (m_actualDecoder)
+        return m_actualDecoder->hotSpot(hotSpot);
+    if (m_hasHotSpot)
+        hotSpot = m_hotSpot;
+    return m_hasHotSpot;
 }
 
 } // namespace blink
 
 namespace WTF {
 template<> struct VectorTraits<blink::DeferredFrameData> : public SimpleClassVectorTraits<blink::DeferredFrameData> {
     STATIC_ONLY(VectorTraits);
     static const bool canInitializeWithMemset = false; // Not all DeferredFrameData members initialize to 0.
 };
 }