| Index: third_party/WebKit/Source/core/loader/ImageLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
|
| index 4c1b72a04de8ff47eb4068e57d879862ff7f487e..f44a419bbed6093a19a060ce482cf6f99db56ad7 100644
|
| --- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
|
| @@ -54,13 +54,13 @@ namespace blink {
|
|
|
| static ImageEventSender& loadEventSender()
|
| {
|
| - DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::load)));
|
| + DEFINE_STATIC_LOCAL(Persistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::load)));
|
| return *sender;
|
| }
|
|
|
| static ImageEventSender& errorEventSender()
|
| {
|
| - DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::error)));
|
| + DEFINE_STATIC_LOCAL(Persistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::error)));
|
| return *sender;
|
| }
|
|
|
| @@ -137,7 +137,7 @@ public:
|
| }
|
|
|
| private:
|
| - RawPtrWillBeWeakPersistent<ImageLoader> m_loader;
|
| + WeakPersistent<ImageLoader> m_loader;
|
| BypassMainWorldBehavior m_shouldBypassMainWorldCSP;
|
| UpdateFromElementBehavior m_updateBehavior;
|
| RefPtr<ScriptState> m_scriptState;
|
| @@ -298,8 +298,8 @@ void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, Up
|
|
|
| AtomicString imageSourceURL = m_element->imageSourceURL();
|
| KURL url = imageSourceToKURL(imageSourceURL);
|
| - RefPtrWillBeRawPtr<ImageResource> newImage = nullptr;
|
| - RefPtrWillBeRawPtr<Element> protectElement(m_element.get());
|
| + RawPtr<ImageResource> newImage = nullptr;
|
| + RawPtr<Element> protectElement(m_element.get());
|
| if (!url.isNull()) {
|
| // Unlike raw <img>, we block mixed content inside of <picture> or <img srcset>.
|
| ResourceLoaderOptions resourceLoaderOptions = ResourceFetcher::defaultResourceOptions();
|
| @@ -347,7 +347,7 @@ void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, Up
|
| noImageResourceToLoad();
|
| }
|
|
|
| - RefPtrWillBeRawPtr<ImageResource> oldImage = m_image.get();
|
| + RawPtr<ImageResource> oldImage = m_image.get();
|
| if (updateBehavior == UpdateSizeChanged && m_element->layoutObject() && m_element->layoutObject()->isImage() && newImage == oldImage) {
|
| toLayoutImage(m_element->layoutObject())->intrinsicSizeChanged();
|
| } else {
|
|
|