Changeset 110581 in webkit

Timestamp:

Mar 13, 2012 11:05:47 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r110469.
​http://trac.webkit.org/changeset/110469
​https://bugs.webkit.org/show_bug.cgi?id=81010

This patch still appears to crash (Requested by abarth on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-03-13

• page/FrameView.cpp:

(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::repaintContentRectangle):
(WebCore):
(WebCore::FrameView::endDeferredRepaints):
(WebCore::FrameView::doDeferredRepaints):
(WebCore::FrameView::deferredRepaintTimerFired):

• page/FrameView.h:

(FrameView):

• rendering/RenderView.cpp:

(WebCore::RenderView::shouldRepaint):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::drawSVGToImageBuffer):
(WebCore::SVGImage::draw):

• svg/graphics/SVGImage.h:
• svg/graphics/SVGImageCache.cpp:

(WebCore::SVGImageCache::imageContentChanged):
(WebCore::SVGImageCache::redrawTimerFired):

• svg/graphics/SVGImageCache.h:

(SVGImageCache):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (8 diffs)
• page/FrameView.h (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (4 diffs)
• svg/graphics/SVGImage.h (modified) (2 diffs)
• svg/graphics/SVGImageCache.cpp (modified) (3 diffs)
• svg/graphics/SVGImageCache.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r110469.
+        http://trac.webkit.org/changeset/110469
+        https://bugs.webkit.org/show_bug.cgi?id=81010
+
+        This patch still appears to crash (Requested by abarth on
+        #webkit).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::repaintContentRectangle):
+        (WebCore):
+        (WebCore::FrameView::endDeferredRepaints):
+        (WebCore::FrameView::doDeferredRepaints):
+        (WebCore::FrameView::deferredRepaintTimerFired):
+        * page/FrameView.h:
+        (FrameView):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::shouldRepaint):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::drawSVGToImageBuffer):
+        (WebCore::SVGImage::draw):
+        * svg/graphics/SVGImage.h:
+        * svg/graphics/SVGImageCache.cpp:
+        (WebCore::SVGImageCache::imageContentChanged):
+        (WebCore::SVGImageCache::redrawTimerFired):
+        * svg/graphics/SVGImageCache.h:
+        (SVGImageCache):
+
 2012-03-13  Max Vujovic  <mvujovic@adobe.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -139 +139 @@
     , m_inProgrammaticScroll(false)
     , m_deferredRepaintTimer(this, &FrameView::deferredRepaintTimerFired)
-    , m_disableRepaints(0)
     , m_isTrackingRepaints(false)
     , m_shouldUpdateWhileOffscreen(true)
@@ -246 +245 @@
     m_firstVisuallyNonEmptyLayoutCallbackPending = true;
     m_maintainScrollPositionAnchor = 0;
-    m_disableRepaints = 0;
 }
 
@@ -1757 +1755 @@
 {
     ASSERT(!m_frame->ownerElement());
-
+    
     if (m_isTrackingRepaints) {
         IntRect repaintRect = r;
@@ -1783 +1781 @@
             m_repaintRects[0].unite(paintRect);
         m_repaintCount++;
-
-        if (!m_deferringRepaints)
-            startDeferredRepaintTimer(delay);
-
+    
+        if (!m_deferringRepaints && !m_deferredRepaintTimer.isActive())
+             m_deferredRepaintTimer.startOneShot(delay);
         return;
     }
@@ -1839 +1836 @@
 }
 
+
 void FrameView::endDeferredRepaints()
 {
@@ -1851 +1849 @@
     if (--m_deferringRepaints)
         return;
+    
+    if (m_deferredRepaintTimer.isActive())
+        return;
 
     if (double delay = adjustedDeferredRepaintDelay()) {
-        startDeferredRepaintTimer(delay);
+        m_deferredRepaintTimer.startOneShot(delay);
         return;
     }
     
     doDeferredRepaints();
-}
-
-void FrameView::startDeferredRepaintTimer(double delay)
-{
-    if (m_deferredRepaintTimer.isActive())
-        return;
-
-    if (m_disableRepaints)
-        return;
-
-    m_deferredRepaintTimer.startOneShot(delay);
 }
 
@@ -1887 +1877 @@
 void FrameView::doDeferredRepaints()
 {
-    if (m_disableRepaints)
-        return;
-
     ASSERT(!m_deferringRepaints);
     if (!shouldUpdate()) {
@@ -1948 +1935 @@
 {
     doDeferredRepaints();
-}
-
-void FrameView::beginDisableRepaints()
-{
-    m_disableRepaints++;
-}
-
-void FrameView::endDisableRepaints()
-{
-    ASSERT(m_disableRepaints > 0);
-    m_disableRepaints--;
-}
+}    
 
 void FrameView::layoutTimerFired(Timer<FrameView>*)

trunk/Source/WebCore/page/FrameView.h

@@ -202 +202 @@
     void endDeferredRepaints();
     void checkStopDelayingDeferredRepaints();
-    void startDeferredRepaintTimer(double delay);
     void resetDeferredRepaintDelay();
-
-    void beginDisableRepaints();
-    void endDisableRepaints();
-    bool repaintsDisabled() { return m_disableRepaints > 0; }
 
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -472 +467 @@
     double m_deferredRepaintDelay;
     double m_lastPaintTime;
-
-    unsigned m_disableRepaints;
-
+    
     bool m_isTrackingRepaints; // Used for testing.
     Vector<IntRect> m_trackedRepaintRects;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -299 +299 @@
     if (!m_frameView)
         return false;
-
-    if (m_frameView->repaintsDisabled())
-        return false;
-
+    
     return true;
 }

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -178 +178 @@
     ASSERT(observer);
 
-    // Temporarily reset image observer, we don't want to receive any changeInRect() calls due to this relayout.
+    // Temporarily reset image observer, we don't want to receive any changeInRect() calls due 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);
@@ -208 +203 @@
         frame->view()->layout();
 
-    setImageObserver(observer);
-
-    frame->view()->endDisableRepaints();
+    setImageObserver(observer); 
 }
 
@@ -218 +211 @@
         return;
 
-    FrameView* view = frameView();
+    FrameView* view = m_page->mainFrame()->view();
 
     GraphicsContextStateSaver stateSaver(*context);
@@ -261 +254 @@
         return 0;
     return toRenderBox(rootElement->renderer());
-}
-
-FrameView* SVGImage::frameView() const
-{
-    if (!m_page)
-        return 0;
-
-    return m_page->mainFrame()->view();
 }
 

trunk/Source/WebCore/svg/graphics/SVGImage.h

@@ -35 +35 @@
 namespace WebCore {
 
-class FrameView;
 class ImageBuffer;
 class Page;
@@ -55 +54 @@
     void drawSVGToImageBuffer(ImageBuffer*, const IntSize&, float zoom, ShouldClearBuffer);
     RenderBox* embeddedContentBox() const;
-    FrameView* frameView() const;
 
     virtual bool isSVGImage() const { return true; }

trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp

@@ -22 +22 @@
 
 #if ENABLE(SVG)
-#include "FrameView.h"
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
@@ -83 +82 @@
         it->second.imageNeedsUpdate = true;
 
-    // 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();
+    // 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);
 }
 
-void SVGImageCache::redraw()
+void SVGImageCache::redrawTimerFired(Timer<SVGImageCache>*)
 {
     ImageDataMap::iterator end = m_imageDataMap.end();
@@ -110 +104 @@
     ASSERT(m_svgImage->imageObserver());
     m_svgImage->imageObserver()->animationAdvanced(m_svgImage);
-}
-
-void SVGImageCache::redrawTimerFired(Timer<SVGImageCache>*)
-{
-    redraw();
 }
 

trunk/Source/WebCore/svg/graphics/SVGImageCache.h

@@ -71 +71 @@
 private:
     SVGImageCache(SVGImage*);
-    void redraw();
     void redrawTimerFired(Timer<SVGImageCache>*);