| Index: Source/core/rendering/RenderImage.cpp
|
| diff --git a/Source/core/rendering/RenderImage.cpp b/Source/core/rendering/RenderImage.cpp
|
| index 5b6cff8a85de4e8dabbbf48b635f6289a1640a6d..ec952803a7268e8b04e119bd56f8386f26abe6e1 100644
|
| --- a/Source/core/rendering/RenderImage.cpp
|
| +++ b/Source/core/rendering/RenderImage.cpp
|
| @@ -63,6 +63,7 @@ RenderImage::RenderImage(Element* element)
|
| , m_imageDevicePixelRatio(1.0f)
|
| {
|
| updateAltText();
|
| + ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRenderObject(this);
|
| }
|
|
|
| RenderImage* RenderImage::createAnonymous(Document* document)
|
| @@ -578,22 +579,10 @@ void RenderImage::layout()
|
| updateInnerContentRect();
|
| }
|
|
|
| -void RenderImage::didLayout(ResourceLoadPriorityOptimizer& optimizer)
|
| -{
|
| - RenderReplaced::didLayout(optimizer);
|
| - updateImageLoadingPriority(optimizer);
|
| -}
|
| -
|
| -void RenderImage::didScroll(ResourceLoadPriorityOptimizer& optimizer)
|
| -{
|
| - RenderReplaced::didScroll(optimizer);
|
| - updateImageLoadingPriority(optimizer);
|
| -}
|
| -
|
| -void RenderImage::updateImageLoadingPriority(ResourceLoadPriorityOptimizer& optimizer)
|
| +bool RenderImage::updateImageLoadingPriorities()
|
| {
|
| if (!m_imageResource || !m_imageResource->cachedImage() || m_imageResource->cachedImage()->isLoaded())
|
| - return;
|
| + return false;
|
|
|
| LayoutRect viewBounds = viewRect();
|
| LayoutRect objectBounds = absoluteContentBox();
|
| @@ -609,7 +598,9 @@ void RenderImage::updateImageLoadingPriority(ResourceLoadPriorityOptimizer& opti
|
| ResourceLoadPriorityOptimizer::VisibilityStatus status = isVisible ?
|
| ResourceLoadPriorityOptimizer::Visible : ResourceLoadPriorityOptimizer::NotVisible;
|
|
|
| - optimizer.notifyImageResourceVisibility(m_imageResource->cachedImage(), status);
|
| + ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->notifyImageResourceVisibility(m_imageResource->cachedImage(), status);
|
| +
|
| + return true;
|
| }
|
|
|
| void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const
|
|
|