refractoring ImageBitmap class

third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp

Index: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
index 0aa638f8170f49389c142cea35afc3cb571fdbfa..979251b4dae2b2fa4459208b99001d79139d6ddf 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
@@ -97,12 +97,12 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency)
     RefPtrWillBeRawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(),
         IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()));
 
-    ASSERT_EQ(imageBitmapNoCrop->bitmapImage().get(), imageElement->cachedImage()->image());
-    ASSERT_EQ(imageBitmapInteriorCrop->bitmapImage().get(), imageElement->cachedImage()->image());
-    ASSERT_EQ(imageBitmapExteriorCrop->bitmapImage().get(), imageElement->cachedImage()->image());
+    ASSERT_EQ(imageBitmapNoCrop->bitmapImage().get(), imageElement->cachedImage()->image()->imageForCurrentFrame().get());
+    ASSERT_EQ(imageBitmapInteriorCrop->bitmapImage().get(), imageElement->cachedImage()->image()->imageForCurrentFrame().get());
+    ASSERT_EQ(imageBitmapExteriorCrop->bitmapImage().get(), imageElement->cachedImage()->image()->imageForCurrentFrame().get());
 
-    RefPtr<Image> emptyImage = imageBitmapOutsideCrop->bitmapImage();
-    ASSERT_NE(emptyImage.get(), imageElement->cachedImage()->image());
+    RefPtr<SkImage> emptyImage = imageBitmapOutsideCrop->bitmapImage();
+    ASSERT_NE(emptyImage.get(), imageElement->cachedImage()->image()->imageForCurrentFrame().get());
 }
 
 // Verifies that HTMLImageElements are given an elevated CacheLiveResourcePriority when used to construct an ImageBitmap.
@@ -161,10 +161,10 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
         RefPtrWillBePersistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(),
             IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()));
 
-        // Images that are referenced by ImageBitmaps have CacheLiveResourcePriorityHigh.
-        ASSERT_EQ(memoryCache()->priority(imageNoCrop->cachedImage()), MemoryCacheLiveResourcePriorityHigh);
-        ASSERT_EQ(memoryCache()->priority(imageInteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityHigh);
-        ASSERT_EQ(memoryCache()->priority(imageExteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityHigh);
+        // Images are not referenced by ImageBitmap anymore, so always CacheLiveResourcePriorityLow
+        ASSERT_EQ(memoryCache()->priority(imageNoCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
+        ASSERT_EQ(memoryCache()->priority(imageInteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
+        ASSERT_EQ(memoryCache()->priority(imageExteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
 
         // ImageBitmaps that do not contain any of the source image do not elevate CacheLiveResourcePriority.
         ASSERT_EQ(memoryCache()->priority(imageOutsideCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
@@ -178,7 +178,7 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
     ASSERT_EQ(memoryCache()->priority(imageOutsideCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
 
     // There is still an ImageBitmap that references this image.
-    ASSERT_EQ(memoryCache()->priority(imageInteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityHigh);
+    ASSERT_EQ(memoryCache()->priority(imageInteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
     imageBitmapInteriorCrop = nullptr;
 }
 
@@ -192,16 +192,16 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
 
     RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(),
         IntRect(0, 0, m_image->width(), m_image->height()));
-    ASSERT_EQ(imageBitmap->bitmapImage().get(), originalImageResource->image());
+    ASSERT_EQ(imageBitmap->bitmapImage().get(), originalImageResource->image()->imageForCurrentFrame().get());
 
     ResourcePtr<ImageResource> newImageResource = new ImageResource(
         StaticBitmapImage::create(m_image2).get());
     image->setImageResource(newImageResource.get());
 
-    // The ImageBitmap should contain the same data as the original cached image but should no longer hold a reference.
+    // The ImageBitmap should contain the same data as the original cached image
     {
-        ASSERT_NE(imageBitmap->bitmapImage().get(), originalImageResource->image());
-        RefPtr<SkImage> image1 = imageBitmap->bitmapImage()->imageForCurrentFrame();
+        ASSERT_EQ(imageBitmap->bitmapImage().get(), originalImageResource->image()->imageForCurrentFrame().get());
+        RefPtr<SkImage> image1 = imageBitmap->bitmapImage();
         ASSERT_NE(image1, nullptr);
         RefPtr<SkImage> image2 = originalImageResource->image()->imageForCurrentFrame();
         ASSERT_NE(image2, nullptr);
@@ -209,8 +209,8 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
     }
 
     {
-        ASSERT_NE(imageBitmap->bitmapImage().get(), newImageResource->image());
-        RefPtr<SkImage> image1 = imageBitmap->bitmapImage()->imageForCurrentFrame();
+        ASSERT_NE(imageBitmap->bitmapImage().get(), newImageResource->image()->imageForCurrentFrame().get());
+        RefPtr<SkImage> image1 = imageBitmap->bitmapImage();
         ASSERT_NE(image1, nullptr);
         RefPtr<SkImage> image2 = newImageResource->image()->imageForCurrentFrame();
         ASSERT_NE(image2, nullptr);