Cancel image loads if decoding failed (attempt #2)

third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/notifications/NotificationImageLoader.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/Histogram.h"
 #include "platform/image-decoders/ImageDecoder.h"
@@ skipping 76 matching lines @@
     if (m_stopped)
         return;
 
     DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, finishedTimeHistogram, new CustomCountHistogram("Notifications.Icon.LoadFinishTime", 1, 1000 * 60 * 60 /* 1 hour max */, 50 /* buckets */));
     finishedTimeHistogram.count(monotonicallyIncreasingTimeMS() - m_startTime);
 
     if (m_data) {
         DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, fileSizeHistogram, new CustomCountHistogram("Notifications.Icon.FileSize", 1, 10000000 /* ~10mb max */, 50 /* buckets */));
         fileSizeHistogram.count(m_data->size());
 
-        std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(*m_data.get(), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
+        std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(ImageDecoder::determineImageType(*m_data.get()), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
         if (decoder) {
             decoder->setData(m_data.get(), true /* allDataReceived */);
             // The |ImageFrame*| is owned by the decoder.
             ImageFrame* imageFrame = decoder->frameBufferAtIndex(0);
             if (imageFrame) {
                 (*m_imageCallback)(imageFrame->bitmap());
                 return;
             }
         }
     }
@@ skipping 17 matching lines @@
 {
     // If this has been stopped it is not desirable to trigger further work,
     // there is a shutdown of some sort in progress.
     if (m_stopped)
         return;
 
     (*m_imageCallback)(SkBitmap());
 }
 
 } // namespace blink