Changeset 140475 in webkit

Timestamp:

Jan 22, 2013, 3:03:28 PM (13 years ago)

Author:

Simon Fraser

Message:

Fix scrollperf logging
​https://bugs.webkit.org/show_bug.cgi?id=107589

Reviewed by Tim Horton.

The scrollperf logging had two issues:

1. It relied on a paint logging a "filled" event, but it's possible

for existing tiles to be moved into the viewport and filling it, so
we need to log from the scrolling thread both when we have unfilled pixels,
and when the last scroll revealed unfilled pixels.

2. On some pages, z-index:-1 elements behind the body cause the root

TileCache to have drawsContent set to false, so none of its tiles paint. In
that case, the check for a non-zero paintCount in TileCache::blankPixelCountForTiles()
was wrong; we don't think there's a way to have an unpainted tile in the tree.

Also fix the signature of blankPixelCountForTiles() to take references.

• page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:

(ScrollingTreeScrollingNodeMac):

• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:

(WebCore::ScrollingTreeScrollingNodeMac::ScrollingTreeScrollingNodeMac):
(WebCore::ScrollingTreeScrollingNodeMac::logExposedUnfilledArea):

• platform/graphics/ca/mac/TileCache.h:
• platform/graphics/ca/mac/TileCache.mm:

(WebCore::TileCache::blankPixelCountForTiles):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (modified) (1 diff)
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (modified) (2 diffs)
• platform/graphics/ca/mac/TileCache.h (modified) (1 diff)
• platform/graphics/ca/mac/TileCache.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix scrollperf logging
+        https://bugs.webkit.org/show_bug.cgi?id=107589
+
+        Reviewed by Tim Horton.
+
+        The scrollperf logging had two issues:
+
+        1. It relied on a paint logging a "filled" event, but it's possible
+        for existing tiles to be moved into the viewport and filling it, so
+        we need to log from the scrolling thread both when we have unfilled pixels,
+        and when the last scroll revealed unfilled pixels.
+        
+        2. On some pages, z-index:-1 elements behind the body cause the root
+        TileCache to have drawsContent set to false, so none of its tiles paint. In
+        that case, the check for a non-zero paintCount in TileCache::blankPixelCountForTiles()
+        was wrong; we don't think there's a way to have an unpainted tile in the tree.
+        
+        Also fix the signature of blankPixelCountForTiles() to take references.
+
+        * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+        (ScrollingTreeScrollingNodeMac):
+        * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeScrollingNodeMac::ScrollingTreeScrollingNodeMac):
+        (WebCore::ScrollingTreeScrollingNodeMac::logExposedUnfilledArea):
+        * platform/graphics/ca/mac/TileCache.h:
+        * platform/graphics/ca/mac/TileCache.mm:
+        (WebCore::TileCache::blankPixelCountForTiles):
+
 2013-01-22  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h

@@ -83 +83 @@
     RetainPtr<CALayer> m_counterScrollingLayer;
     IntPoint m_probableMainThreadScrollPosition;
+    bool m_lastScrollHadUnfilledPixels;
 };
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm

@@ -54 +54 @@
     : ScrollingTreeScrollingNode(scrollingTree)
     , m_scrollElasticityController(this)
+    , m_lastScrollHadUnfilledPixels(false)
 {
 }
@@ -357 +358 @@
     unsigned unfilledArea = TileCache::blankPixelCountForTiles(tiles, viewportRect(), IntPoint(-scrollPosition.x(), -scrollPosition.y()));
 
-    if (unfilledArea)
+    if (unfilledArea || m_lastScrollHadUnfilledPixels)
         WTFLogAlways("SCROLLING: Exposed tileless area. Time: %f Unfilled Pixels: %u\n", WTF::monotonicallyIncreasingTime(), unfilledArea);
+
+    m_lastScrollHadUnfilledPixels = unfilledArea;
 }
 

trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h

@@ -80 +80 @@
 
     unsigned blankPixelCount() const;
-    static unsigned blankPixelCountForTiles(const WebTileLayerList&, IntRect, IntPoint);
+    static unsigned blankPixelCountForTiles(const WebTileLayerList&, const IntRect&, const IntPoint&);
 
     // Only public for the WebTileCacheMapLayer.

trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm

@@ -489 +489 @@
 }
 
-unsigned TileCache::blankPixelCountForTiles(const WebTileLayerList& tiles, IntRect visibleRect, IntPoint tileTranslation)
+unsigned TileCache::blankPixelCountForTiles(const WebTileLayerList& tiles, const IntRect& visibleRect, const IntPoint& tileTranslation)
 {
     Region paintedVisibleTiles;
@@ -499 +499 @@
         visiblePart.intersect(visibleRect);
 
-        if (!visiblePart.isEmpty() && [tileLayer paintCount])
+        if (!visiblePart.isEmpty())
             paintedVisibleTiles.unite(visiblePart);
     }