Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(768)

Unified Diff: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp

Issue 1577783003: Revert of Add a origin clean flag in ImageBitmap class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f22d25956e69865d417b86a3b1f12c8838cc2b86..54f9870eaa7bb51e97f93d23f6bfaab92084981a 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
@@ -85,17 +85,13 @@
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()),
- &(imageElement->document()));
+ IntRect(0, 0, m_image->width(), m_image->height()));
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()));
+ IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width() / 2, m_image->height() / 2));
RefPtrWillBeRawPtr<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageElement.get(),
- IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
- &(imageElement->document()));
+ IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()));
RefPtrWillBeRawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(),
- IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
- &(imageElement->document()));
+ IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()));
ASSERT_EQ(imageBitmapNoCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame());
ASSERT_NE(imageBitmapInteriorCrop->bitmapImage()->imageForCurrentFrame(), imageElement->cachedImage()->image()->imageForCurrentFrame());
@@ -150,21 +146,16 @@
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()),
- &(imageInteriorCrop->document()));
+ IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()));
{
RefPtrWillBePersistent<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageNoCrop.get(),
- IntRect(0, 0, m_image->width(), m_image->height()),
- &(imageNoCrop->document()));
+ IntRect(0, 0, m_image->width(), m_image->height()));
RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop2 = ImageBitmap::create(imageInteriorCrop.get(),
- IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()),
- &(imageInteriorCrop->document()));
+ IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()));
RefPtrWillBePersistent<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageExteriorCrop.get(),
- IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
- &(imageExteriorCrop->document()));
+ IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()));
RefPtrWillBePersistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(),
- IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
- &(imageOutsideCrop->document()));
+ IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()));
// Images are not referenced by ImageBitmap anymore, so always CacheLiveResourcePriorityLow
ASSERT_EQ(memoryCache()->priority(imageNoCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
@@ -196,8 +187,7 @@
image->setImageResource(originalImageResource.get());
RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(),
- IntRect(0, 0, m_image->width(), m_image->height()),
- &(image->document()));
+ IntRect(0, 0, m_image->width(), m_image->height()));
ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(), originalImageResource->image()->imageForCurrentFrame());
ResourcePtr<ImageResource> newImageResource = new ImageResource(
« no previous file with comments | « third_party/WebKit/Source/core/frame/ImageBitmap.cpp ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698