| 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 17aae33ffedf05876f74bcdf6ba5e75556ff3062..9fd293d6e497108ed70a001f26581729d7434718 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| @@ -81,20 +81,20 @@ protected:
|
| TEST_F(ImageBitmapTest, ImageResourceConsistency)
|
| {
|
| const ImageBitmapOptions defaultOptions;
|
| - RefPtrWillBeRawPtr<HTMLImageElement> imageElement = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> image = ImageResource::create(StaticBitmapImage::create(m_image).get());
|
| + RawPtr<HTMLImageElement> imageElement = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> image = ImageResource::create(StaticBitmapImage::create(m_image).get());
|
| imageElement->setImageResource(image.get());
|
|
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageElement.get(),
|
| + RawPtr<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| &(imageElement->document()), defaultOptions);
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageElement.get(),
|
| + RawPtr<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()), defaultOptions);
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageElement.get(),
|
| + RawPtr<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
|
| &(imageElement->document()), defaultOptions);
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(),
|
| + RawPtr<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageElement.get(),
|
| IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
|
| &(imageElement->document()), defaultOptions);
|
|
|
| @@ -110,23 +110,23 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency)
|
| // ImageBitmaps that have crop rects outside of the bounds of the HTMLImageElement do not have elevated CacheLiveResourcePriority.
|
| TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
|
| {
|
| - RefPtrWillBePersistent<HTMLImageElement> imageNoCrop = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> cachedImageNoCrop = ImageResource::create(ResourceRequest("http://foo.com/1"),
|
| + Persistent<HTMLImageElement> imageNoCrop = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> cachedImageNoCrop = ImageResource::create(ResourceRequest("http://foo.com/1"),
|
| StaticBitmapImage::create(m_image).get());
|
| imageNoCrop->setImageResource(cachedImageNoCrop.get());
|
|
|
| - RefPtrWillBePersistent<HTMLImageElement> imageInteriorCrop = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> cachedImageInteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/2"),
|
| + Persistent<HTMLImageElement> imageInteriorCrop = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> cachedImageInteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/2"),
|
| StaticBitmapImage::create(m_image).get());
|
| imageInteriorCrop->setImageResource(cachedImageInteriorCrop.get());
|
|
|
| - RefPtrWillBePersistent<HTMLImageElement> imageExteriorCrop = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> cachedImageExteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/3"),
|
| + Persistent<HTMLImageElement> imageExteriorCrop = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> cachedImageExteriorCrop = ImageResource::create(ResourceRequest("http://foo.com/3"),
|
| StaticBitmapImage::create(m_image).get());
|
| imageExteriorCrop->setImageResource(cachedImageExteriorCrop.get());
|
|
|
| - RefPtrWillBePersistent<HTMLImageElement> imageOutsideCrop = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> cachedImageOutsideCrop = ImageResource::create(ResourceRequest("http://foo.com/4"),
|
| + Persistent<HTMLImageElement> imageOutsideCrop = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> cachedImageOutsideCrop = ImageResource::create(ResourceRequest("http://foo.com/4"),
|
| StaticBitmapImage::create(m_image).get());
|
| imageOutsideCrop->setImageResource(cachedImageOutsideCrop.get());
|
|
|
| @@ -151,20 +151,20 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
|
| ASSERT_EQ(memoryCache()->priority(imageOutsideCrop->cachedImage()), MemoryCacheLiveResourcePriorityLow);
|
|
|
| const ImageBitmapOptions defaultOptions;
|
| - RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageInteriorCrop.get(),
|
| + Persistent<ImageBitmap> imageBitmapInteriorCrop = ImageBitmap::create(imageInteriorCrop.get(),
|
| IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()),
|
| &(imageInteriorCrop->document()), defaultOptions);
|
| {
|
| - RefPtrWillBePersistent<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageNoCrop.get(),
|
| + Persistent<ImageBitmap> imageBitmapNoCrop = ImageBitmap::create(imageNoCrop.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| &(imageNoCrop->document()), defaultOptions);
|
| - RefPtrWillBePersistent<ImageBitmap> imageBitmapInteriorCrop2 = ImageBitmap::create(imageInteriorCrop.get(),
|
| + Persistent<ImageBitmap> imageBitmapInteriorCrop2 = ImageBitmap::create(imageInteriorCrop.get(),
|
| IntRect(m_image->width() / 2, m_image->height() / 2, m_image->width(), m_image->height()),
|
| &(imageInteriorCrop->document()), defaultOptions);
|
| - RefPtrWillBePersistent<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageExteriorCrop.get(),
|
| + Persistent<ImageBitmap> imageBitmapExteriorCrop = ImageBitmap::create(imageExteriorCrop.get(),
|
| IntRect(-m_image->width() / 2, -m_image->height() / 2, m_image->width(), m_image->height()),
|
| &(imageExteriorCrop->document()), defaultOptions);
|
| - RefPtrWillBePersistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(),
|
| + Persistent<ImageBitmap> imageBitmapOutsideCrop = ImageBitmap::create(imageOutsideCrop.get(),
|
| IntRect(-m_image->width(), -m_image->height(), m_image->width(), m_image->height()),
|
| &(imageOutsideCrop->document()), defaultOptions);
|
|
|
| @@ -192,18 +192,18 @@ TEST_F(ImageBitmapTest, ImageBitmapLiveResourcePriority)
|
| // Verifies that ImageBitmaps constructed from HTMLImageElements hold a reference to the original Image if the HTMLImageElement src is changed.
|
| TEST_F(ImageBitmapTest, ImageBitmapSourceChanged)
|
| {
|
| - RefPtrWillBeRawPtr<HTMLImageElement> image = HTMLImageElement::create(*Document::create().get());
|
| - RefPtrWillBeRawPtr<ImageResource> originalImageResource = ImageResource::create(
|
| + RawPtr<HTMLImageElement> image = HTMLImageElement::create(*Document::create().get());
|
| + RawPtr<ImageResource> originalImageResource = ImageResource::create(
|
| StaticBitmapImage::create(m_image).get());
|
| image->setImageResource(originalImageResource.get());
|
|
|
| const ImageBitmapOptions defaultOptions;
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(),
|
| + RawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(),
|
| IntRect(0, 0, m_image->width(), m_image->height()),
|
| &(image->document()), defaultOptions);
|
| ASSERT_EQ(imageBitmap->bitmapImage()->imageForCurrentFrame(), originalImageResource->image()->imageForCurrentFrame());
|
|
|
| - RefPtrWillBeRawPtr<ImageResource> newImageResource = ImageResource::create(
|
| + RawPtr<ImageResource> newImageResource = ImageResource::create(
|
| StaticBitmapImage::create(m_image2).get());
|
| image->setImageResource(newImageResource.get());
|
|
|
|
|