Move some ResourceClients for testing to Oilpan heap

third_party/WebKit/Source/core/fetch/MockResourceClients.cpp

 // Copyright 2015 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 "core/fetch/MockResourceClients.h"
 
 #include "core/fetch/ImageResource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 MockResourceClient::MockResourceClient(Resource* resource)
     : m_resource(resource)
     , m_notifyFinishedCalled(false)
 {
+    ThreadState::current()->registerPreFinalizer(this);
     m_resource->addClient(this);
 }
 
-MockResourceClient::~MockResourceClient()
-{
-    if (m_resource)
-        m_resource->removeClient(this);
-}
+MockResourceClient::~MockResourceClient() {}
+
 void MockResourceClient::notifyFinished(Resource*)
 {
     ASSERT_FALSE(m_notifyFinishedCalled);
     m_notifyFinishedCalled = true;
 }
 
 void MockResourceClient::removeAsClient()
 {
     m_resource->removeClient(this);
     m_resource = nullptr;
 }
 
+void MockResourceClient::dispose()
+{
+    if (m_resource) {
+        m_resource->removeClient(this);
+        m_resource = nullptr;
+    }
+}
+
+DEFINE_TRACE(MockResourceClient)
+{
+    visitor->trace(m_resource);
+}
+
 MockImageResourceClient::MockImageResourceClient(ImageResource* resource)
     : MockResourceClient(resource)
     , m_imageChangedCount(0)
     , m_imageNotifyFinishedCount(0)
 {
     toImageResource(m_resource.get())->addObserver(this);
 }
 
-MockImageResourceClient::~MockImageResourceClient()
-{
-    if (m_resource)
-        toImageResource(m_resource.get())->removeObserver(this);
-}
+MockImageResourceClient::~MockImageResourceClient() {}
 
 void MockImageResourceClient::removeAsClient()
 {
     toImageResource(m_resource.get())->removeObserver(this);
     MockResourceClient::removeAsClient();
 }
 
+void MockImageResourceClient::dispose()
+{
+    if (m_resource)
+        toImageResource(m_resource.get())->removeObserver(this);

[haraken, 2016/05/20 07:37:38]

Not related to this CL, we might want to move ImageResourceObserver to the heap
as well.

[yhirano, 2016/05/20 07:45:45]

LayoutObject inherits ImageResourceObserver and according to Elliot it will not
be moved to Oilpan heap. Actually, that's why we decoupled ImageResourceObserver
from ResourceClient.

+    MockResourceClient::dispose();
+}
+
 void MockImageResourceClient::imageChanged(ImageResource*, const IntRect*)
 {
     m_imageChangedCount++;
 }
 
 void MockImageResourceClient::imageNotifyFinished(ImageResource*)
 {
     ASSERT_EQ(0, m_imageNotifyFinishedCount);
     m_imageNotifyFinishedCount++;
 }
 
 bool MockImageResourceClient::notifyFinishedCalled() const
 {
     EXPECT_EQ(m_notifyFinishedCalled ? 1 : 0, m_imageNotifyFinishedCount);
 
     return m_notifyFinishedCalled;
 }
 
 } // namespace blink