| Index: third_party/WebKit/Source/core/layout/ImageQualityController.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/ImageQualityController.cpp b/third_party/WebKit/Source/core/layout/ImageQualityController.cpp
|
| index 75ab18561e39a6550264e630c8453dafc682c4f1..f85d2d8466a6fe8700fc501078794589d56d5f48 100644
|
| --- a/third_party/WebKit/Source/core/layout/ImageQualityController.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/ImageQualityController.cpp
|
| @@ -89,7 +89,6 @@ ImageQualityController::~ImageQualityController()
|
|
|
| ImageQualityController::ImageQualityController()
|
| : m_timer(adoptPtr(new Timer<ImageQualityController>(this, &ImageQualityController::highQualityRepaintTimerFired)))
|
| - , m_liveResizeOptimizationIsActive(false)
|
| {
|
| }
|
|
|
| @@ -131,13 +130,6 @@ void ImageQualityController::objectDestroyed(const LayoutObject& object)
|
| void ImageQualityController::highQualityRepaintTimerFired(Timer<ImageQualityController>*)
|
| {
|
| for (auto* layoutObject : m_objectLayerSizeMap.keys()) {
|
| - if (LocalFrame* frame = layoutObject->document().frame()) {
|
| - // If this layoutObject's containing FrameView is in live resize, punt the timer and hold back for now.
|
| - if (frame->view() && frame->view()->inLiveResize()) {
|
| - restartTimer();
|
| - return;
|
| - }
|
| - }
|
| ObjectLayerSizeMap::iterator i = m_objectLayerSizeMap.find(layoutObject);
|
| if (i != m_objectLayerSizeMap.end()) {
|
| // Only invalidate the object if it is animating.
|
| @@ -148,8 +140,6 @@ void ImageQualityController::highQualityRepaintTimerFired(Timer<ImageQualityCont
|
| i->value.isResizing = false;
|
| }
|
| }
|
| -
|
| - m_liveResizeOptimizationIsActive = false;
|
| }
|
|
|
| void ImageQualityController::restartTimer()
|
| @@ -188,22 +178,6 @@ bool ImageQualityController::shouldPaintAtLowQuality(const LayoutObject& object,
|
| }
|
| }
|
|
|
| - // If the containing FrameView is being resized, paint at low quality until resizing is finished.
|
| - if (LocalFrame* frame = object.document().frame()) {
|
| - bool frameViewIsCurrentlyInLiveResize = frame->view() && frame->view()->inLiveResize();
|
| - if (frameViewIsCurrentlyInLiveResize) {
|
| - set(object, innerMap, layer, layoutSize, true);
|
| - restartTimer();
|
| - m_liveResizeOptimizationIsActive = true;
|
| - return true;
|
| - }
|
| - if (m_liveResizeOptimizationIsActive) {
|
| - // Live resize has ended, paint in HQ and remove this object from the list.
|
| - removeLayer(object, innerMap, layer);
|
| - return false;
|
| - }
|
| - }
|
| -
|
| if (layoutSize == image->size()) {
|
| // There is no scale in effect. If we had a scale in effect before, we can just remove this object from the list.
|
| removeLayer(object, innerMap, layer);
|
|
|