Changeset 31858 in webkit

Timestamp:

Apr 13, 2008 11:23:50 PM (16 years ago)

Author:

hyatt@apple.com

Message:

2008-04-13 David Hyatt <​hyatt@apple.com>

Fix for bug 18466, WebKit exhibits slow performance on Opera DHTML benchmark. Improve layout's rect
invalidation code to only invalidate a single unioned rect once enough individual little rects have
been detected.

Reviewed by olliej

• page/FrameView.cpp: (WebCore::FrameViewPrivate::reset): (WebCore::FrameView::layout): (WebCore::FrameView::repaintRectangle): (WebCore::FrameView::beginDeferredRepaints): (WebCore::FrameView::endDeferredRepaints):
• page/FrameView.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)
• page/FrameView.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-13  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 18466, WebKit exhibits slow performance on Opera DHTML benchmark.  Improve layout's rect
+        invalidation code to only invalidate a single unioned rect once enough individual little rects have
+        been detected.
+
+        Reviewed by olliej
+
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::reset):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::repaintRectangle):
+        (WebCore::FrameView::beginDeferredRepaints):
+        (WebCore::FrameView::endDeferredRepaints):
+        * page/FrameView.h:
+
 2008-04-13  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/page/FrameView.cpp

@@ -94 +94 @@
         lastLayoutSize = IntSize();
         lastZoomFactor = 1.0f;
+        m_deferringRepaints = 0;
+        m_repaintCount = 0;
+        m_repaintRect = IntRect();
+        m_repaintRects.clear();
     }
 
@@ -134 +138 @@
     bool m_wasScrolledByUser;
     bool m_inProgrammaticScroll;
+    
+    unsigned m_deferringRepaints;
+    unsigned m_repaintCount;
+    IntRect m_repaintRect;
+    Vector<IntRect> m_repaintRects;
 };
 
@@ -467 +476 @@
     if (subtree)
         root->view()->pushLayoutState(root);
+        
     d->midLayout = true;
+    beginDeferredRepaints();
     root->layout();
+    endDeferredRepaints();
     d->midLayout = false;
+
     if (subtree)
         root->view()->popLayoutState();
@@ -482 +495 @@
 
     // Now update the positions of all layers.
+    beginDeferredRepaints();
     layer->updateLayerPositions(d->doFullRepaint);
-
+    endDeferredRepaints();
+    
     d->layoutCount++;
 
@@ -694 +709 @@
 }
 
+const unsigned cRepaintRectUnionThreshold = 25;
+
 void FrameView::repaintRectangle(const IntRect& r, bool immediate)
 {
+    if (d->m_deferringRepaints && !immediate) {
+        IntRect visibleContent = enclosingIntRect(visibleContentRect());
+        visibleContent.intersect(r);
+        if (!visibleContent.isEmpty()) {
+            d->m_repaintCount++;
+            d->m_repaintRect.unite(r);
+            if (d->m_repaintCount == cRepaintRectUnionThreshold)
+                d->m_repaintRects.clear();
+            else if (d->m_repaintCount < cRepaintRectUnionThreshold)
+                d->m_repaintRects.append(r);
+        }
+        return;
+    }
+    
     updateContents(r, immediate);
+}
+
+void FrameView::beginDeferredRepaints()
+{
+    Page* page = m_frame->page();
+    if (page->mainFrame() != m_frame)
+        return page->mainFrame()->view()->beginDeferredRepaints();
+
+    d->m_deferringRepaints++;
+    d->m_repaintCount = 0;
+    d->m_repaintRect = IntRect();
+    d->m_repaintRects.clear();
+}
+
+
+void FrameView::endDeferredRepaints()
+{
+    Page* page = m_frame->page();
+    if (page->mainFrame() != m_frame)
+        return page->mainFrame()->view()->endDeferredRepaints();
+
+    ASSERT(d->m_deferringRepaints > 0);
+    if (--d->m_deferringRepaints == 0) {
+        if (d->m_repaintCount >= cRepaintRectUnionThreshold)
+            repaintRectangle(d->m_repaintRect, false);
+        else {
+            unsigned size = d->m_repaintRects.size();
+            for (unsigned i = 0; i < size; i++)
+                repaintRectangle(d->m_repaintRects[i], false);
+            d->m_repaintRects.clear();
+        }
+    }
 }
 

trunk/WebCore/page/FrameView.h

@@ -122 +122 @@
     void removeSlowRepaintObject();
 
+    void beginDeferredRepaints();
+    void endDeferredRepaints();
+
     void updateDashboardRegions();
     void updateControlTints();