- Revision
- 110309
- Author
- [email protected]
- Date
- 2012-03-09 11:21:53 -0800 (Fri, 09 Mar 2012)
Log Message
Infinite repaint loop with SVGImageCache and deferred repaint timers
https://bugs.webkit.org/show_bug.cgi?id=78315
<rdar://problem/10651634>
Reviewed by Nikolas Zimmermann.
Only defer image redraw on a timer if we're in layout. This breaks
the repaint loop while still preventing us from drawing inside layout.
Completely disable repaint during relayout inside SVGImage::drawSVGToImageBuffer,
preventing deferred repaint timers from being started during that process.
No new tests, as the problem only occurs in a nonstandard configuration.
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::draw):
(WebCore::SVGImage::frameView):
(WebCore):
* svg/graphics/SVGImage.h:
(WebCore):
* svg/graphics/SVGImageCache.cpp:
(WebCore::SVGImageCache::imageContentChanged):
(WebCore::SVGImageCache::redraw):
(WebCore::SVGImageCache::redrawTimerFired):
(WebCore):
* svg/graphics/SVGImageCache.h:
(SVGImageCache):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110308 => 110309)
--- trunk/Source/WebCore/ChangeLog 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/ChangeLog 2012-03-09 19:21:53 UTC (rev 110309)
@@ -1,3 +1,33 @@
+2012-03-09 Tim Horton <[email protected]>
+
+ Infinite repaint loop with SVGImageCache and deferred repaint timers
+ https://bugs.webkit.org/show_bug.cgi?id=78315
+ <rdar://problem/10651634>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Only defer image redraw on a timer if we're in layout. This breaks
+ the repaint loop while still preventing us from drawing inside layout.
+
+ Completely disable repaint during relayout inside SVGImage::drawSVGToImageBuffer,
+ preventing deferred repaint timers from being started during that process.
+
+ No new tests, as the problem only occurs in a nonstandard configuration.
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::draw):
+ (WebCore::SVGImage::frameView):
+ (WebCore):
+ * svg/graphics/SVGImage.h:
+ (WebCore):
+ * svg/graphics/SVGImageCache.cpp:
+ (WebCore::SVGImageCache::imageContentChanged):
+ (WebCore::SVGImageCache::redraw):
+ (WebCore::SVGImageCache::redrawTimerFired):
+ (WebCore):
+ * svg/graphics/SVGImageCache.h:
+ (SVGImageCache):
+
2012-03-09 Victor Carbune <[email protected]>
The method TextTrackCue::getCueAsHTML() should return different
Modified: trunk/Source/WebCore/page/FrameView.cpp (110308 => 110309)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-03-09 19:21:53 UTC (rev 110309)
@@ -138,6 +138,7 @@
, m_wasScrolledByUser(false)
, m_inProgrammaticScroll(false)
, m_deferredRepaintTimer(this, &FrameView::deferredRepaintTimerFired)
+ , m_disableRepaints(0)
, m_isTrackingRepaints(false)
, m_shouldUpdateWhileOffscreen(true)
, m_deferSetNeedsLayouts(0)
@@ -244,6 +245,7 @@
m_isVisuallyNonEmpty = false;
m_firstVisuallyNonEmptyLayoutCallbackPending = true;
m_maintainScrollPositionAnchor = 0;
+ m_disableRepaints = 0;
}
bool FrameView::isFrameView() const
@@ -1754,7 +1756,7 @@
void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
{
ASSERT(!m_frame->ownerElement());
-
+
if (m_isTrackingRepaints) {
IntRect repaintRect = r;
repaintRect.move(-scrollOffset());
@@ -1934,8 +1936,19 @@
void FrameView::deferredRepaintTimerFired(Timer<FrameView>*)
{
doDeferredRepaints();
-}
+}
+void FrameView::beginDisableRepaints()
+{
+ m_disableRepaints++;
+}
+
+void FrameView::endDisableRepaints()
+{
+ ASSERT(m_disableRepaints > 0);
+ m_disableRepaints--;
+}
+
void FrameView::layoutTimerFired(Timer<FrameView>*)
{
#ifdef INSTRUMENT_LAYOUT_SCHEDULING
Modified: trunk/Source/WebCore/page/FrameView.h (110308 => 110309)
--- trunk/Source/WebCore/page/FrameView.h 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/page/FrameView.h 2012-03-09 19:21:53 UTC (rev 110309)
@@ -203,6 +203,10 @@
void checkStopDelayingDeferredRepaints();
void resetDeferredRepaintDelay();
+ void beginDisableRepaints();
+ void endDisableRepaints();
+ bool repaintsDisabled() { return m_disableRepaints > 0; }
+
#if ENABLE(DASHBOARD_SUPPORT)
void updateDashboardRegions();
#endif
@@ -466,7 +470,9 @@
Timer<FrameView> m_deferredRepaintTimer;
double m_deferredRepaintDelay;
double m_lastPaintTime;
-
+
+ unsigned m_disableRepaints;
+
bool m_isTrackingRepaints; // Used for testing.
Vector<IntRect> m_trackedRepaintRects;
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (110308 => 110309)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2012-03-09 19:21:53 UTC (rev 110309)
@@ -298,7 +298,10 @@
if (!m_frameView)
return false;
-
+
+ if (m_frameView->repaintsDisabled())
+ return false;
+
return true;
}
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (110308 => 110309)
--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2012-03-09 19:21:53 UTC (rev 110309)
@@ -177,10 +177,15 @@
ImageObserver* observer = imageObserver();
ASSERT(observer);
- // Temporarily reset image observer, we don't want to receive any changeInRect() calls due this relayout.
+ // Temporarily reset image observer, we don't want to receive any changeInRect() calls due to this relayout.
setImageObserver(0);
+
+ // Disable repainting; we don't want deferred repaints to schedule any timers due to this relayout.
+ frame->view()->beginDisableRepaints();
+
renderer->setContainerSize(size);
frame->view()->resize(this->size());
+
if (zoom != 1)
frame->setPageZoomFactor(zoom);
@@ -202,7 +207,9 @@
if (frame->view()->needsLayout())
frame->view()->layout();
- setImageObserver(observer);
+ setImageObserver(observer);
+
+ frame->view()->endDisableRepaints();
}
void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp)
@@ -210,7 +217,7 @@
if (!m_page)
return;
- FrameView* view = m_page->mainFrame()->view();
+ FrameView* view = frameView();
GraphicsContextStateSaver stateSaver(*context);
context->setCompositeOperation(compositeOp);
@@ -255,6 +262,14 @@
return toRenderBox(rootElement->renderer());
}
+FrameView* SVGImage::frameView() const
+{
+ if (!m_page)
+ return 0;
+
+ return m_page->mainFrame()->view();
+}
+
bool SVGImage::hasRelativeWidth() const
{
if (!m_page)
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (110308 => 110309)
--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2012-03-09 19:21:53 UTC (rev 110309)
@@ -34,6 +34,7 @@
namespace WebCore {
+class FrameView;
class ImageBuffer;
class Page;
class RenderBox;
@@ -53,6 +54,7 @@
void drawSVGToImageBuffer(ImageBuffer*, const IntSize&, float zoom, ShouldClearBuffer);
RenderBox* embeddedContentBox() const;
+ FrameView* frameView() const;
virtual bool isSVGImage() const { return true; }
virtual IntSize size() const;
Modified: trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp (110308 => 110309)
--- trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp 2012-03-09 19:21:53 UTC (rev 110309)
@@ -21,6 +21,7 @@
#include "SVGImageCache.h"
#if ENABLE(SVG)
+#include "FrameView.h"
#include "GraphicsContext.h"
#include "ImageBuffer.h"
#include "RenderSVGRoot.h"
@@ -81,13 +82,18 @@
for (ImageDataMap::iterator it = m_imageDataMap.begin(); it != end; ++it)
it->second.imageNeedsUpdate = true;
- // Start redrawing dirty images with a timer, as imageContentChanged() may be called
- // by the FrameView of the SVGImage which is currently in FrameView::layout().
- if (!m_redrawTimer.isActive())
- m_redrawTimer.startOneShot(0);
+ // If we're in the middle of layout, start redrawing dirty
+ // images on a timer; otherwise it's safe to draw immediately.
+
+ FrameView* frameView = m_svgImage->frameView();
+ if (frameView && frameView->needsLayout()) {
+ if (!m_redrawTimer.isActive())
+ m_redrawTimer.startOneShot(0);
+ } else
+ redraw();
}
-void SVGImageCache::redrawTimerFired(Timer<SVGImageCache>*)
+void SVGImageCache::redraw()
{
ImageDataMap::iterator end = m_imageDataMap.end();
for (ImageDataMap::iterator it = m_imageDataMap.begin(); it != end; ++it) {
@@ -105,6 +111,11 @@
m_svgImage->imageObserver()->animationAdvanced(m_svgImage);
}
+void SVGImageCache::redrawTimerFired(Timer<SVGImageCache>*)
+{
+ redraw();
+}
+
Image* SVGImageCache::lookupOrCreateBitmapImageForRenderer(const RenderObject* renderer)
{
ASSERT(renderer);
Modified: trunk/Source/WebCore/svg/graphics/SVGImageCache.h (110308 => 110309)
--- trunk/Source/WebCore/svg/graphics/SVGImageCache.h 2012-03-09 19:16:12 UTC (rev 110308)
+++ trunk/Source/WebCore/svg/graphics/SVGImageCache.h 2012-03-09 19:21:53 UTC (rev 110309)
@@ -70,6 +70,7 @@
private:
SVGImageCache(SVGImage*);
+ void redraw();
void redrawTimerFired(Timer<SVGImageCache>*);
struct ImageData {
