[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/frame/ImageBitmapTest.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "core/frame/ImageBitmap.h"
 
 #include "SkPixelRef.h"  // FIXME: qualify this skia header file.
 #include "core/dom/Document.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/heap/Handle.h"
 #include "platform/network/ResourceRequest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 28 matching lines @@
   }
 
   sk_sp<SkImage> m_image, m_image2;
   Persistent<MemoryCache> m_globalMemoryCache;
 };
 
 TEST_F(ImageBitmapTest, ImageResourceConsistency) {
   const ImageBitmapOptions defaultOptions;
   HTMLImageElement* imageElement =
       HTMLImageElement::create(*Document::create());
-  ImageResource* image =
-      ImageResource::create(StaticBitmapImage::create(m_image).get());
+  ImageResourceContent* image =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image).get());
   imageElement->setImageResource(image);
 
   Optional<IntRect> cropRect =
       IntRect(0, 0, m_image->width(), m_image->height());
   ImageBitmap* imageBitmapNoCrop = ImageBitmap::create(
       imageElement, cropRect, &(imageElement->document()), defaultOptions);
   cropRect = IntRect(m_image->width() / 2, m_image->height() / 2,
                      m_image->width() / 2, m_image->height() / 2);
   ImageBitmap* imageBitmapInteriorCrop = ImageBitmap::create(
       imageElement, cropRect, &(imageElement->document()), defaultOptions);
@@ skipping 15 matching lines @@
 
   StaticBitmapImage* emptyImage = imageBitmapOutsideCrop->bitmapImage();
   ASSERT_NE(emptyImage->imageForCurrentFrame(),
             imageElement->cachedImage()->getImage()->imageForCurrentFrame());
 }
 
 // Verifies that ImageBitmaps constructed from HTMLImageElements hold a
 // reference to the original Image if the HTMLImageElement src is changed.
 TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) {
   HTMLImageElement* image = HTMLImageElement::create(*Document::create());
-  ImageResource* originalImageResource =
-      ImageResource::create(StaticBitmapImage::create(m_image).get());
+  ImageResourceContent* originalImageResource =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image).get());
   image->setImageResource(originalImageResource);
 
   const ImageBitmapOptions defaultOptions;
   Optional<IntRect> cropRect =
       IntRect(0, 0, m_image->width(), m_image->height());
   ImageBitmap* imageBitmap = ImageBitmap::create(
       image, cropRect, &(image->document()), defaultOptions);
   ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(),
             originalImageResource->getImage()->imageForCurrentFrame());
 
-  ImageResource* newImageResource =
-      ImageResource::create(StaticBitmapImage::create(m_image2).get());
+  ImageResourceContent* newImageResource =
+      ImageResourceContent::create(StaticBitmapImage::create(m_image2).get());
   image->setImageResource(newImageResource);
 
   // The ImageBitmap should contain the same data as the original cached image
   {
     ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(),
               originalImageResource->getImage()->imageForCurrentFrame());
     SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get();
     ASSERT_NE(image1, nullptr);
     SkImage* image2 =
         originalImageResource->getImage()->imageForCurrentFrame().get();
     ASSERT_NE(image2, nullptr);
     ASSERT_EQ(image1, image2);
   }
 
   {
     ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(),
               newImageResource->getImage()->imageForCurrentFrame());
     SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get();
     ASSERT_NE(image1, nullptr);
     SkImage* image2 =
         newImageResource->getImage()->imageForCurrentFrame().get();
     ASSERT_NE(image2, nullptr);
     ASSERT_NE(image1, image2);
   }
 }
 
 }  // namespace blink