| 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 0b6aa4aeb17d4806ac730ee67e2c86e1a58ed1bf..d387aa43495aa1ad774d76328e76a63dab1684bb 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| @@ -84,18 +84,19 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency)
|
| RefPtrWillBeRawPtr<HTMLImageElement> imageElement = HTMLImageElement::create(*Document::create().get());
|
| imageElement->setImageResource(new ImageResource(StaticBitmapImage::create(m_image).get()));
|
|
|
| + ImageBitmapOptions options;
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| - &(imageElement->document()));
|
| + &(imageElement->document()), options);
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width() / 2, m_image->height() / 2),
|
| - &(imageElement->document()));
|
| + &(imageElement->document()), options);
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
|
| - &(imageElement->document()));
|
| + &(imageElement->document()), options);
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
|
| - &(imageElement->document()));
|
| + &(imageElement->document()), options);
|
|
|
| ASSERT_EQ(imageBitmapNoCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame());
|
| ASSERT_NE(imageBitmapInteriorCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame());
|
| @@ -149,22 +150,23 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
|
| ASSERT_EQ(memoryCache()->priority(imageExteriorCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
|
| ASSERT_EQ(memoryCache()->priority(imageOutsideCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
|
|
|
| + ImageBitmapOptions options;
|
| RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageInteriorCrop.get(),
|
| IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()),
|
| - &(imageInteriorCrop->document()));
|
| + &(imageInteriorCrop->document()), options);
|
| {
|
| RefPtrWillBePersistent<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageNoCrop.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| - &(imageNoCrop->document()));
|
| + &(imageNoCrop->document()), options);
|
| RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop2 = ImageBitmap::create(imageInteriorCrop.get(),
|
| IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()),
|
| - &(imageInteriorCrop->document()));
|
| + &(imageInteriorCrop->document()), options);
|
| RefPtrWillBePersistent<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageExteriorCrop.get(),
|
| IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
|
| - &(imageExteriorCrop->document()));
|
| + &(imageExteriorCrop->document()), options);
|
| RefPtrWillBePersistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(),
|
| IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
|
| - &(imageOutsideCrop->document()));
|
| + &(imageOutsideCrop->document()), options);
|
|
|
| // Images are not referenced by ImageBitmap anymore, so always CacheLiveResourcePriorityLow
|
| ASSERT_EQ(memoryCache()->priority(imageNoCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
|
| @@ -195,9 +197,10 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
|
| StaticBitmapImage::create(m_image).get());
|
| image->setImageResource(originalImageResource.get());
|
|
|
| + ImageBitmapOptions options;
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| - &(image->document()));
|
| + &(image->document()), options);
|
| ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(), originalImageResource->image()->imageForCurrentFrame());
|
|
|
| ResourcePtr<ImageResource> newImageResource = new ImageResource(
|
|
|