Changeset 203261 in webkit


Ignore:
Timestamp:
Jul 14, 2016, 6:46:25 PM (9 years ago)
Author:
Simon Fraser
Message:

[iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first
​https://bugs.webkit.org/show_bug.cgi?id=159798
rdar://problem/27362717

Reviewed by Tim Horton.
Source/WebCore:

In out-of-visible tiled layers, we always allocated the top-left tile, wasting
memory and causing ugliness when scrolling that layer into view. This happened
because getTileIndexRangeForRect() had no way to express the fact that no tiles
should be created.

Fix getTileIndexRangeForRect() to return a bool, and fix callers to respect the
return value.

Test: compositing/tiling/offscreen-tiled-layer.html

  • platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::dumpAdditionalProperties):

  • platform/graphics/ca/TileGrid.cpp:

(WebCore::TileGrid::setNeedsDisplayInRect):
(WebCore::TileGrid::tilesWouldChangeForCoverageRect):
(WebCore::TileGrid::getTileIndexRangeForRect):
(WebCore::TileGrid::revalidateTiles):
(WebCore::TileGrid::ensureTilesForRect):
(WebCore::TileGrid::extent):

  • platform/graphics/ca/TileGrid.h:

LayoutTests:

Test with an offscreen tiled layer.

  • compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
  • compositing/tiling/offscreen-tiled-layer.html: Added.
  • platform/ios-simulator-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
  • platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
  • platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
Location:
trunk
Files:
5 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r203260 r203261  
     12016-07-14  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first
     4        https://bugs.webkit.org/show_bug.cgi?id=159798
     5        rdar://problem/27362717
     6
     7        Reviewed by Tim Horton.
     8       
     9        Test with an offscreen tiled layer.
     10
     11        * compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
     12        * compositing/tiling/offscreen-tiled-layer.html: Added.
     13        * platform/ios-simulator-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
     14        * platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
     15        * platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt: Added.
     16
    1172016-07-14  Ryan Haddad  <ryanhaddad@apple.com>
    218

  • trunk/Source/WebCore/ChangeLog

    r203258 r203261  
     12016-07-14  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first
     4        https://bugs.webkit.org/show_bug.cgi?id=159798
     5        rdar://problem/27362717
     6
     7        Reviewed by Tim Horton.
     8
     9        In out-of-visible tiled layers, we always allocated the top-left tile, wasting
     10        memory and causing ugliness when scrolling that layer into view. This happened
     11        because getTileIndexRangeForRect() had no way to express the fact that no tiles
     12        should be created.
     13
     14        Fix getTileIndexRangeForRect() to return a bool, and fix callers to respect the
     15        return value.
     16
     17        Test: compositing/tiling/offscreen-tiled-layer.html
     18
     19        * platform/graphics/ca/GraphicsLayerCA.cpp:
     20        (WebCore::GraphicsLayerCA::dumpAdditionalProperties):
     21        * platform/graphics/ca/TileGrid.cpp:
     22        (WebCore::TileGrid::setNeedsDisplayInRect):
     23        (WebCore::TileGrid::tilesWouldChangeForCoverageRect):
     24        (WebCore::TileGrid::getTileIndexRangeForRect):
     25        (WebCore::TileGrid::revalidateTiles):
     26        (WebCore::TileGrid::ensureTilesForRect):
     27        (WebCore::TileGrid::extent):
     28        * platform/graphics/ca/TileGrid.h:
     29
    1302016-07-14  John Wilander  <wilander@apple.com>
    231

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r202330 r203261  
    34973497    if (behavior & LayerTreeAsTextDebug) {
    34983498        writeIndent(textStream, indent + 1);
    3499         textStream << "(acceleratetes drawing " << m_acceleratesDrawing << ")\n";
     3499        textStream << "(accelerates drawing " << m_acceleratesDrawing << ")\n";
    35003500        writeIndent(textStream, indent + 1);
    35013501        textStream << "(uses display-list drawing " << m_usesDisplayListDrawing << ")\n";

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

    r200465 r203261  
    113113        TileIndex topLeft;
    114114        TileIndex bottomRight;
    115         getTileIndexRangeForRect(repaintRectInTileCoords, topLeft, bottomRight);
    116 
    117         for (int y = topLeft.y(); y <= bottomRight.y(); ++y) {
    118             for (int x = topLeft.x(); x <= bottomRight.x(); ++x) {
    119                 TileIndex tileIndex(x, y);
    120                
    121                 TileMap::iterator it = m_tiles.find(tileIndex);
    122                 if (it != m_tiles.end())
    123                     setTileNeedsDisplayInRect(tileIndex, it->value, repaintRectInTileCoords, m_primaryTileCoverageRect);
     115        if (getTileIndexRangeForRect(repaintRectInTileCoords, topLeft, bottomRight)) {
     116            for (int y = topLeft.y(); y <= bottomRight.y(); ++y) {
     117                for (int x = topLeft.x(); x <= bottomRight.x(); ++x) {
     118                    TileIndex tileIndex(x, y);
     119                   
     120                    TileMap::iterator it = m_tiles.find(tileIndex);
     121                    if (it != m_tiles.end())
     122                        setTileNeedsDisplayInRect(tileIndex, it->value, repaintRectInTileCoords, m_primaryTileCoverageRect);
     123                }
    124124            }
    125125        }
    … …  
    200200    IntRect currentCoverageRectInTileCoords(enclosingIntRect(scaledRect));
    201201
     202    IntRect tileCoverageRect;
    202203    TileIndex topLeft;
    203204    TileIndex bottomRight;
    204     getTileIndexRangeForRect(currentCoverageRectInTileCoords, topLeft, bottomRight);
    205 
    206     IntRect tileCoverageRect = rectForTileIndex(topLeft);
    207     tileCoverageRect.unite(rectForTileIndex(bottomRight));
     205    if (getTileIndexRangeForRect(currentCoverageRectInTileCoords, topLeft, bottomRight)) {
     206        tileCoverageRect = rectForTileIndex(topLeft);
     207        tileCoverageRect.unite(rectForTileIndex(bottomRight));
     208    }
     209
    208210    return tileCoverageRect != m_primaryTileCoverageRect;
    209211}
    … …  
    232234}
    233235
    234 void TileGrid::getTileIndexRangeForRect(const IntRect& rect, TileIndex& topLeft, TileIndex& bottomRight) const
     236bool TileGrid::getTileIndexRangeForRect(const IntRect& rect, TileIndex& topLeft, TileIndex& bottomRight) const
    235237{
    236238    IntRect clampedRect = m_controller.bounds();
    237239    clampedRect.scale(m_scale);
    238240    clampedRect.intersect(rect);
     241   
     242    if (clampedRect.isEmpty())
     243        return false;
    239244
    240245    auto tileSize = m_tileSize;
    … …  
    254259    int bottomYRatio = ceil((float)clampedRect.maxY() / tileSize.height());
    255260    bottomRight.setY(std::max(bottomYRatio - 1, 0));
     261   
     262    return true;
    256263}
    257264
    … …  
    349356        PlatformCALayer* tileLayer = tileInfo.layer.get();
    350357        IntRect tileRect = rectForTileIndex(tileIndex);
     358
    351359        if (tileRect.intersects(coverageRectInTileCoords)) {
    352360            tileInfo.cohort = VisibleTileCohort;
    … …  
    445453        TileIndex topLeftForBounds;
    446454        TileIndex bottomRightForBounds;
    447         getTileIndexRangeForRect(boundsInTileCoords, topLeftForBounds, bottomRightForBounds);
    448 
    449         Vector<TileIndex> tilesToRemove;
    450         for (auto& index : m_tiles.keys()) {
    451             if (index.y() < topLeftForBounds.y() || index.y() > bottomRightForBounds.y() || index.x() < topLeftForBounds.x() || index.x() > bottomRightForBounds.x())
    452                 tilesToRemove.append(index);
    453         }
    454         removeTiles(tilesToRemove);
     455        if (getTileIndexRangeForRect(boundsInTileCoords, topLeftForBounds, bottomRightForBounds)) {
     456            Vector<TileIndex> tilesToRemove;
     457            for (auto& index : m_tiles.keys()) {
     458                if (index.y() < topLeftForBounds.y() || index.y() > bottomRightForBounds.y() || index.x() < topLeftForBounds.x() || index.x() > bottomRightForBounds.x())
     459                    tilesToRemove.append(index);
     460            }
     461            removeTiles(tilesToRemove);
     462        }
    455463    }
    456464
    … …  
    527535    TileIndex topLeft;
    528536    TileIndex bottomRight;
    529     getTileIndexRangeForRect(rectInTileCoords, topLeft, bottomRight);
     537    if (!getTileIndexRangeForRect(rectInTileCoords, topLeft, bottomRight))
     538        return IntRect();
    530539
    531540    TileCohort currCohort = nextTileCohort();
    … …  
    582591    TileIndex topLeft;
    583592    TileIndex bottomRight;
    584     getTileIndexRangeForRect(m_primaryTileCoverageRect, topLeft, bottomRight);
    585 
    586     // Return index of top, left tile and the number of tiles across and down.
    587     return IntRect(topLeft.x(), topLeft.y(), bottomRight.x() - topLeft.x() + 1, bottomRight.y() - topLeft.y() + 1);
     593    if (getTileIndexRangeForRect(m_primaryTileCoverageRect, topLeft, bottomRight)) {
     594        // Return index of top, left tile and the number of tiles across and down.
     595        return IntRect(topLeft.x(), topLeft.y(), bottomRight.x() - topLeft.x() + 1, bottomRight.y() - topLeft.y() + 1);
     596    }
     597
     598    return IntRect();
    588599}
    589600

  • trunk/Source/WebCore/platform/graphics/ca/TileGrid.h

    r197594 r203261  
    111111
    112112    IntRect rectForTileIndex(const TileIndex&) const;
    113     void getTileIndexRangeForRect(const IntRect&, TileIndex& topLeft, TileIndex& bottomRight) const;
     113    bool getTileIndexRangeForRect(const IntRect&, TileIndex& topLeft, TileIndex& bottomRight) const;
    114114
    115115    enum class CoverageType { PrimaryTiles, SecondaryTiles };
Note: See TracChangeset for help on using the changeset viewer.