| Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
|
| diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
|
| index 08acf409fbc5e9e134c7eba0a6c7d4d1b3ba3d90..608823a33574513083679c996b7fe5cf694897af 100644
|
| --- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
|
| +++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
|
| @@ -56,17 +56,17 @@ namespace blink {
|
| static inline ImageBitmapSource* toImageBitmapSourceInternal(const ImageBitmapSourceUnion& value)
|
| {
|
| if (value.isHTMLImageElement())
|
| - return value.getAsHTMLImageElement().get();
|
| + return value.getAsHTMLImageElement();
|
| if (value.isHTMLVideoElement())
|
| - return value.getAsHTMLVideoElement().get();
|
| + return value.getAsHTMLVideoElement();
|
| if (value.isHTMLCanvasElement())
|
| - return value.getAsHTMLCanvasElement().get();
|
| + return value.getAsHTMLCanvasElement();
|
| if (value.isBlob())
|
| return value.getAsBlob();
|
| if (value.isImageData())
|
| return value.getAsImageData();
|
| if (value.isImageBitmap())
|
| - return value.getAsImageBitmap().get();
|
| + return value.getAsImageBitmap();
|
| ASSERT_NOT_REACHED();
|
| return nullptr;
|
| }
|
| @@ -143,10 +143,10 @@ ImageBitmapFactories& ImageBitmapFactories::from(EventTarget& eventTarget)
|
| template<class GlobalObject>
|
| ImageBitmapFactories& ImageBitmapFactories::fromInternal(GlobalObject& object)
|
| {
|
| - ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(WillBeHeapSupplement<GlobalObject>::from(object, supplementName()));
|
| + ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(HeapSupplement<GlobalObject>::from(object, supplementName()));
|
| if (!supplement) {
|
| supplement = new ImageBitmapFactories();
|
| - WillBeHeapSupplement<GlobalObject>::provideTo(object, supplementName(), adoptPtrWillBeNoop(supplement));
|
| + HeapSupplement<GlobalObject>::provideTo(object, supplementName(), adoptPtrWillBeNoop(supplement));
|
| }
|
| return *supplement;
|
| }
|
| @@ -179,8 +179,8 @@ void ImageBitmapFactories::ImageBitmapLoader::loadBlobAsync(ExecutionContext* co
|
| DEFINE_TRACE(ImageBitmapFactories)
|
| {
|
| visitor->trace(m_pendingLoaders);
|
| - WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
|
| - WillBeHeapSupplement<WorkerGlobalScope>::trace(visitor);
|
| + HeapSupplement<LocalDOMWindow>::trace(visitor);
|
| + HeapSupplement<WorkerGlobalScope>::trace(visitor);
|
| }
|
|
|
| void ImageBitmapFactories::ImageBitmapLoader::rejectPromise()
|
| @@ -249,7 +249,7 @@ void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(Pas
|
| m_cropRect = IntRect(IntPoint(), image->size());
|
| }
|
|
|
| - RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image, m_cropRect, m_options);
|
| + RawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image, m_cropRect, m_options);
|
| if (imageBitmap && imageBitmap->bitmapImage()) {
|
| m_resolver->resolve(imageBitmap.release());
|
| } else {
|
|
|