Allow eviction of ImageBitmaps that are created from ImageElements.

Source/core/loader/cache/CachedImageTest.cpp

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/loader/cache/CachedImage.h"
 
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/EmptyClients.h"
-#include "core/loader/cache/CachedImageClient.h"
 #include "core/loader/cache/CachedResourceHandle.h"
 #include "core/loader/cache/MemoryCache.h"
+#include "core/loader/cache/MockCachedImageClient.h"
 #include "core/loader/cache/ResourceFetcher.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameView.h"
 #include "core/page/Page.h"
 #include "core/platform/SharedBuffer.h"
-#include "core/platform/graphics/Image.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
-#include <gtest/gtest.h>
 
 using namespace WebCore;
 
 namespace {
 
-class MockCachedImageClient : public WebCore::CachedImageClient {
-public:
-    MockCachedImageClient()
-        : m_imageChangedCount(0)
-        , m_notifyFinishedCalled(false)
-    {
-    }
-
-    virtual ~MockCachedImageClient() { }
-    virtual void imageChanged(CachedImage*, const IntRect*)
-    {
-        m_imageChangedCount++;
-    }
-
-    virtual void notifyFinished(CachedResource*)
-    {
-        ASSERT_FALSE(m_notifyFinishedCalled);
-        m_notifyFinishedCalled = true;
-    }
-
-    int imageChangedCount() const { return m_imageChangedCount; }
-    bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
-
-private:
-    int m_imageChangedCount;
-    bool m_notifyFinishedCalled;
-};
-
 class QuitTask : public WebKit::WebThread::Task {
 public:
     virtual void run()
     {
         WebKit::Platform::current()->currentThread()->exitRunLoop();
     }
 };
 
 void runPendingTasks()
 {
@@ skipping 83 matching lines @@
 
     // Trigger the cancel timer, ensure the load was cancelled and the resource was evicted from the cache.
     runPendingTasks();
     EXPECT_EQ(CachedResource::LoadError, cachedImage->status());
     EXPECT_EQ(reinterpret_cast<CachedResource*>(0), memoryCache()->resourceForURL(testURL));
 
     WebKit::Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 }
 
 } // namespace