Changeset 211766 in webkit

Timestamp:

Feb 6, 2017 6:19:54 PM (7 years ago)

Author:

Simon Fraser

Message:

Re-land r210095 (avoid a tile revalidation on scale change)
​https://bugs.webkit.org/show_bug.cgi?id=167866

Reviewed by Tim Horton.

r210095 was rolled out in r211230 but now that all TileControllers unparent
offscreen tiles, we can roll it back it.

Also add more Tiling logging.

• platform/graphics/ca/TileGrid.cpp:

(WebCore::validationPolicyAsString):
(WebCore::TileGrid::setScale):
(WebCore::TileGrid::prepopulateRect):
(WebCore::TileGrid::revalidateTiles):
(WebCore::TileGrid::ensureTilesForRect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/TileGrid.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Re-land r210095 (avoid a tile revalidation on scale change)
+        https://bugs.webkit.org/show_bug.cgi?id=167866
+
+        Reviewed by Tim Horton.
+        
+        r210095 was rolled out in r211230 but now that all TileControllers unparent
+        offscreen tiles, we can roll it back it.
+        
+        Also add more Tiling logging.
+
+        * platform/graphics/ca/TileGrid.cpp:
+        (WebCore::validationPolicyAsString):
+        (WebCore::TileGrid::setScale):
+        (WebCore::TileGrid::prepopulateRect):
+        (WebCore::TileGrid::revalidateTiles):
+        (WebCore::TileGrid::ensureTilesForRect):
+
 2017-02-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp

@@ -45 +45 @@
 namespace WebCore {
 
+#if !LOG_DISABLED
+static String validationPolicyAsString(TileGrid::TileValidationPolicy validationPolicy)
+{
+    StringBuilder builder;
+    builder.appendLiteral("[");
+    if (validationPolicy & TileGrid::PruneSecondaryTiles)
+        builder.appendLiteral("prune secondary");
+
+    if (validationPolicy & TileGrid::UnparentAllTiles) {
+        if (builder.isEmpty())
+            builder.appendLiteral(", ");
+        builder.appendLiteral("unparent all");
+    }
+    builder.appendLiteral("]");
+
+    return builder.toString();
+}
+#endif
+
 TileGrid::TileGrid(TileController& controller)
     : m_controller(controller)
@@ -79 +98 @@
     m_containerLayer->setTransform(transform);
 
-    // FIXME: we may revalidateTiles twice in this commit.
-    revalidateTiles(PruneSecondaryTiles);
+    m_controller.setNeedsRevalidateTiles();
 
     m_containerLayer.get().setContentsScale(m_controller.deviceScaleFactor());
@@ -216 +234 @@
 bool TileGrid::prepopulateRect(const FloatRect& rect)
 {
+    LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " prepopulateRect: " << rect);
+
     IntRect enclosingCoverageRect = enclosingIntRect(rect);
     if (m_primaryTileCoverageRect.contains(enclosingCoverageRect))
@@ -332 +352 @@
     FloatRect coverageRect = m_controller.coverageRect();
     IntRect bounds = m_controller.bounds();
+
+    LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " revalidateTiles: bounds " << bounds << " coverageRect" << coverageRect << " validation: " << validationPolicyAsString(validationPolicy));
 
     if (coverageRect.isEmpty() || bounds.isEmpty())
@@ -535 +557 @@
         return IntRect();
 
+    LOG_WITH_STREAM(Tiling, stream << "TileGrid " << this << " ensureTilesForRect: " << rect);
+
     FloatRect scaledRect(rect);
     scaledRect.scale(m_scale);