Move ThreadableLoader to Oilpan heap (2/3)

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"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/Threading.h"
 #include <memory>
 
 namespace blink {
 
 NotificationImageLoader::NotificationImageLoader()
     : m_stopped(false), m_startTime(0.0)
 {
 }
 
 NotificationImageLoader::~NotificationImageLoader()
 {

[haraken, 2016/07/29 14:52:51]

Can we add:

  ASSERT(!m_threadableLoader);

?

[yhirano, 2016/08/01 06:20:06]

It's possible, but as in WorkerThreadableLoader::Peer::~Peer(), I think
requiring it is not necessary.

 }
 
 void NotificationImageLoader::start(ExecutionContext* executionContext, const KURL& url, std::unique_ptr<ImageCallback> imageCallback)
 {
     DCHECK(!m_stopped);
 
     m_startTime = monotonicallyIncreasingTimeMS();
     m_imageCallback = std::move(imageCallback);
 
     // TODO(mvanouwerkerk): Add a timeout mechanism: crbug.com/579137.
@@ skipping 17 matching lines @@
 }
 
 void NotificationImageLoader::stop()
 {
     if (m_stopped)
         return;
 
     m_stopped = true;
     if (m_threadableLoader) {
         m_threadableLoader->cancel();
-        // WorkerThreadableLoader keeps a Persistent<WorkerGlobalScope> to the
-        // ExecutionContext it received in |create|. Kill it to prevent
-        // reference cycles involving a mix of GC and non-GC types that fail to
-        // clear in ThreadState::cleanup.
-        m_threadableLoader.reset();
+        m_threadableLoader = nullptr;
     }
 }
 
 void NotificationImageLoader::didReceiveData(const char* data, unsigned length)
 {
     if (!m_data)
         m_data = SharedBuffer::create();
     m_data->append(data, length);
 }
 
@@ skipping 42 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