| Index: third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| index 51116922dc562ddd736e11d51eaeb402f776289d..55e30a9458c597141ed503e0c09865edb4d96b3c 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| @@ -35,16 +35,12 @@ class NullImageResourceInfo final
|
|
|
| private:
|
| const KURL& url() const override { return m_url; }
|
| - bool isSchedulingReload() const override { return false; }
|
| bool hasDevicePixelRatioHeaderValue() const override { return false; }
|
| float devicePixelRatioHeaderValue() const override { return 1.0; }
|
| const ResourceResponse& response() const override { return m_response; }
|
| ResourceStatus getStatus() const override { return ResourceStatus::Cached; }
|
| bool shouldShowPlaceholder() const override { return false; }
|
| bool isCacheValidator() const override { return false; }
|
| - bool schedulingReloadOrShouldReloadBrokenPlaceholder() const override {
|
| - return false;
|
| - }
|
| bool isAccessAllowed(
|
| SecurityOrigin*,
|
| DoesCurrentFrameHaveSingleSecurityOrigin) const override {
|
| @@ -115,8 +111,7 @@ void ImageResourceContent::addObserver(ImageResourceObserver* observer) {
|
| observer->imageChanged(this);
|
| }
|
|
|
| - if (isLoaded() && m_observers.contains(observer) &&
|
| - !m_info->schedulingReloadOrShouldReloadBrokenPlaceholder()) {
|
| + if (isLoaded() && m_observers.contains(observer)) {
|
| markObserverFinished(observer);
|
| observer->imageNotifyFinished(this);
|
| }
|
| @@ -269,8 +264,7 @@ void ImageResourceContent::notifyObservers(
|
| if (m_observers.contains(observer)) {
|
| observer->imageChanged(this, changeRect);
|
| if (notifyingFinishOption == ShouldNotifyFinish &&
|
| - m_observers.contains(observer) &&
|
| - !m_info->schedulingReloadOrShouldReloadBrokenPlaceholder()) {
|
| + m_observers.contains(observer)) {
|
| markObserverFinished(observer);
|
| observer->imageNotifyFinished(this);
|
| }
|
|
|