Chromium Code Reviews| 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 54f9870eaa7bb51e97f93d23f6bfaab92084981a..05155adca1864ed858cf435f38fc6a9221feea55 100644 |
| --- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
| @@ -85,13 +85,17 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency) |
| imageElement->setImageResource(new ImageResource(StaticBitmapImage::create(m_image).get())); |
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageElement.get(), |
| - IntRect(0, 0, m_image->width(), m_image->height())); |
| + IntRect(0, 0, m_image->width(), m_image->height()), |
| + Document::create().get()); |
|
Justin Novosad
2015/12/23 18:06:34
I think this should use imageElement->document(),
xidachen
2015/12/29 15:04:14
Done.
|
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageElement.get(), |
| - IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width() / 2, m_image->height() / 2)); |
| + IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width() / 2, m_image->height() / 2), |
| + Document::create().get()); |
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageElement.get(), |
| - IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height())); |
| + IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(), |
| - IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height())); |
| + IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()), |
| + Document::create().get()); |
| ASSERT_EQ(imageBitmapNoCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame()); |
| ASSERT_NE(imageBitmapInteriorCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame()); |
| @@ -146,16 +150,21 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority) |
| ASSERT_EQ(memoryCache()->priority(imageOutsideCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow); |
| RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageInteriorCrop.get(), |
| - IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height())); |
| + IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| { |
| RefPtrWillBePersistent<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageNoCrop.get(), |
| - IntRect(0, 0, m_image->width(), m_image->height())); |
| + IntRect(0, 0, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop2 = ImageBitmap::create(imageInteriorCrop.get(), |
| - IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height())); |
| + IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| RefPtrWillBePersistent<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageExteriorCrop.get(), |
| - IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height())); |
| + IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| RefPtrWillBePersistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(), |
| - IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height())); |
| + IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()), |
| + Document::create().get()); |
| // Images are not referenced by ImageBitmap anymore, so always CacheLiveResourcePriorityLow |
| ASSERT_EQ(memoryCache()->priority(imageNoCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow); |
| @@ -187,7 +196,8 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) |
| image->setImageResource(originalImageResource.get()); |
| RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(), |
| - IntRect(0, 0, m_image->width(), m_image->height())); |
| + IntRect(0, 0, m_image->width(), m_image->height()), |
| + Document::create().get()); |
| ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(), originalImageResource->image()->imageForCurrentFrame()); |
| ResourcePtr<ImageResource> newImageResource = new ImageResource( |