Changeset 115752 in webkit

Timestamp:

May 1, 2012 3:22:25 PM (12 years ago)

Author:

andersca@apple.com

Message:

Slow scrolling on www.sholby.net
​https://bugs.webkit.org/show_bug.cgi?id=85304
<rdar://problem/11138952>

Reviewed by Beth Dakin.

Fix two performance issues that showed up on the profiles.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
Reset the relevant painted object counter; it's only interesting when loading.

• page/Page.cpp:

(WebCore::Page::startCountingRelevantRepaintedObjects):
Set m_isCountingRelevantRepaintedObjects to true after calling reset, since reset now sets it to false.

(WebCore::Page::resetRelevantPaintedObjectCounter):
Set m_isCountingRelevantRepaintedObjects to false.

(WebCore::Page::addRelevantRepaintedObject):
Use HashSet::find to avoid an extra hash lookup.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::updateMainFrameScrollPositionAndScrollLayerPosition):
Remove the call to FrameView::updateCompositingLayersAfterLayout now, since FrameView::notifyScrollPositionChanged
already calls this and was making us to a lot of work twice.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)
• page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-01  Anders Carlsson  <andersca@apple.com>
+
+        Slow scrolling on www.sholby.net
+        https://bugs.webkit.org/show_bug.cgi?id=85304
+        <rdar://problem/11138952>
+
+        Reviewed by Beth Dakin.
+
+        Fix two performance issues that showed up on the profiles.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        Reset the relevant painted object counter; it's only interesting when loading.
+
+        * page/Page.cpp:
+        (WebCore::Page::startCountingRelevantRepaintedObjects):
+        Set m_isCountingRelevantRepaintedObjects to true after calling reset, since reset now sets it to false.
+
+        (WebCore::Page::resetRelevantPaintedObjectCounter):
+        Set m_isCountingRelevantRepaintedObjects to false.
+
+        (WebCore::Page::addRelevantRepaintedObject):
+        Use HashSet::find to avoid an extra hash lookup.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::updateMainFrameScrollPositionAndScrollLayerPosition):
+        Remove the call to FrameView::updateCompositingLayersAfterLayout now, since FrameView::notifyScrollPositionChanged
+        already calls this and was making us to a lot of work twice.
+
 2012-05-01  Silvia Pfeiffer  <silviapf@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2103 +2103 @@
                 return;
 
-            if (Page* page = m_frame->page())
+            if (Page* page = m_frame->page()) {
                 page->progress()->progressCompleted(m_frame);
+
+                if (m_frame == page->mainFrame())
+                    page->resetRelevantPaintedObjectCounter();
+            }
 
             const ResourceError& error = dl->mainDocumentError();

trunk/Source/WebCore/page/Page.cpp

@@ -1040 +1040 @@
 void Page::startCountingRelevantRepaintedObjects()
 {
-    m_isCountingRelevantRepaintedObjects = true;
-
     // Reset everything in case we didn't hit the threshold last time.
     resetRelevantPaintedObjectCounter();
+
+    m_isCountingRelevantRepaintedObjects = true;
 }
 
 void Page::resetRelevantPaintedObjectCounter()
 {
+    m_isCountingRelevantRepaintedObjects = false;
     m_relevantUnpaintedRenderObjects.clear();
     m_relevantPaintedRegion = Region();
@@ -1068 +1069 @@
     // If this object was previously counted as an unpainted object, remove it from that HashSet
     // and corresponding Region. FIXME: This doesn't do the right thing if the objects overlap.
-    if (m_relevantUnpaintedRenderObjects.contains(object)) {
-        m_relevantUnpaintedRenderObjects.remove(object);
+    HashSet<RenderObject*>::iterator it = m_relevantUnpaintedRenderObjects.find(object);
+    if (it != m_relevantUnpaintedRenderObjects.end()) {
+        m_relevantUnpaintedRenderObjects.remove(it);
         m_relevantUnpaintedRegion.subtract(snappedPaintRect);
     }

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -287 +287 @@
     IntPoint scrollPosition = m_scrollingTree->mainFrameScrollPosition();
 
-    // Make sure to update the main frame scroll position before changing the scroll layer position,
-    // otherwise we'll introduce jittering on pages with slow repaint objects (like background-attachment: fixed).
-    frameView->updateCompositingLayersAfterLayout();
     frameView->setConstrainsScrollingToContentEdge(false);
     frameView->notifyScrollPositionChanged(scrollPosition);