Changeset 158859 in webkit


Ignore:
Timestamp:
Nov 7, 2013, 11:34:01 AM (11 years ago)
Author:
Simon Fraser
Message:

Allow customization of the contentsScale of TileController tiles
​https://bugs.webkit.org/show_bug.cgi?id=124004

Reviewed by Tim Horton.

On some platorms, zooming out on pages with TiledBacking compositing
layers can cause very high memory use, because the TiledBacking retains
the original page scale while the zoom is in flight, but can be asked
to cover a large area.

Make it possible to reduce memory use in this case by allowing RenderLayerCompositor
to provide an additional scale factor for newly created tiles. Platforms can
then customize this to create low-res tiles when necessary.

  • WebCore.exp.in:
  • platform/graphics/GraphicsLayerClient.h:

(WebCore::GraphicsLayerClient::contentsScaleMultiplierForNewTiles):

  • platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::platformCALayerContentsScaleMultiplierForNewTiles):

  • platform/graphics/ca/GraphicsLayerCA.h:
  • platform/graphics/ca/PlatformCALayerClient.h:

(WebCore::PlatformCALayerClient::platformCALayerContentsScaleMultiplierForNewTiles):

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

(WebCore::TileController::TileController):
(WebCore::TileController::setScale):
(WebCore::TileController::createTileLayer):

  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::contentsScaleMultiplierForNewTiles):

  • rendering/RenderLayerBacking.h:
  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::contentsScaleMultiplierForNewTiles):

  • rendering/RenderLayerCompositor.h:
Location:
trunk/Source/WebCore
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r158856 r158859  
     12013-11-07  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Allow customization of the contentsScale of TileController tiles
     4        https://bugs.webkit.org/show_bug.cgi?id=124004
     5
     6        Reviewed by Tim Horton.
     7
     8        On some platorms, zooming out on pages with TiledBacking compositing
     9        layers can cause very high memory use, because the TiledBacking retains
     10        the original page scale while the zoom is in flight, but can be asked
     11        to cover a large area.
     12       
     13        Make it possible to reduce memory use in this case by allowing RenderLayerCompositor
     14        to provide an additional scale factor for newly created tiles. Platforms can
     15        then customize this to create low-res tiles when necessary.
     16
     17        * WebCore.exp.in:
     18        * platform/graphics/GraphicsLayerClient.h:
     19        (WebCore::GraphicsLayerClient::contentsScaleMultiplierForNewTiles):
     20        * platform/graphics/ca/GraphicsLayerCA.cpp:
     21        (WebCore::GraphicsLayerCA::platformCALayerContentsScaleMultiplierForNewTiles):
     22        * platform/graphics/ca/GraphicsLayerCA.h:
     23        * platform/graphics/ca/PlatformCALayerClient.h:
     24        (WebCore::PlatformCALayerClient::platformCALayerContentsScaleMultiplierForNewTiles):
     25        * platform/graphics/ca/mac/TileController.h:
     26        * platform/graphics/ca/mac/TileController.mm:
     27        (WebCore::TileController::TileController):
     28        (WebCore::TileController::setScale):
     29        (WebCore::TileController::createTileLayer):
     30        * rendering/RenderLayerBacking.cpp:
     31        (WebCore::RenderLayerBacking::contentsScaleMultiplierForNewTiles):
     32        * rendering/RenderLayerBacking.h:
     33        * rendering/RenderLayerCompositor.cpp:
     34        (WebCore::RenderLayerCompositor::contentsScaleMultiplierForNewTiles):
     35        * rendering/RenderLayerCompositor.h:
     36
    1372013-11-07  Jer Noble  <jer.noble@apple.com>
    238

  • trunk/Source/WebCore/WebCore.exp.in

    r158853 r158859  
    557557__ZN7WebCore15GraphicsLayerCA37flushCompositingStateForThisLayerOnlyEv
    558558__ZN7WebCore15GraphicsLayerCA40platformCALayerSetNeedsToRevalidateTilesEv
     559__ZNK7WebCore15GraphicsLayerCA49platformCALayerContentsScaleMultiplierForNewTilesEPNS_15PlatformCALayerE
     560__ZThn496_NK7WebCore15GraphicsLayerCA49platformCALayerContentsScaleMultiplierForNewTilesEPNS_15PlatformCALayerE
    559561__ZN7WebCore15GraphicsLayerCA7setNameERKN3WTF6StringE
    560562__ZN7WebCore15GraphicsLayerCA7setSizeERKNS_9FloatSizeE

  • trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h

    r156749 r158859  
    8989    virtual float pageScaleFactor() const { return 1; }
    9090
     91    virtual float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const { return 1; }
     92
    9193    virtual bool isTrackingRepaints() const { return false; }
    9294

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

    r158704 r158859  
    12341234}
    12351235
     1236float GraphicsLayerCA::platformCALayerContentsScaleMultiplierForNewTiles(PlatformCALayer*) const
     1237{
     1238    return client() ? client()->contentsScaleMultiplierForNewTiles(this) : 1;
     1239}
     1240
    12361241void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect, TransformationMatrix* transformFromRoot)
    12371242{

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

    r158704 r158859  
    178178    virtual void platformCALayerSetNeedsToRevalidateTiles() OVERRIDE;
    179179    virtual float platformCALayerDeviceScaleFactor() const OVERRIDE;
     180    virtual float platformCALayerContentsScaleMultiplierForNewTiles(PlatformCALayer*) const OVERRIDE;
     181
    180182    virtual bool isCommittingChanges() const OVERRIDE { return m_isCommittingChanges; }
    181183

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

    r158704 r158859  
    6262    virtual void platformCALayerSetNeedsToRevalidateTiles() { }
    6363    virtual float platformCALayerDeviceScaleFactor() const = 0;
     64    virtual float platformCALayerContentsScaleMultiplierForNewTiles(PlatformCALayer*) const { return 1; }
    6465
    6566    virtual bool isCommittingChanges() const { return false; }

  • trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h

    r158704 r158859  
    228228    bool m_tilesAreOpaque;
    229229    bool m_clipsToExposedRect;
     230    bool m_hasTilesWithTemporaryScaleFactor; // Used to make low-res tiles when zooming.
    230231
    231232    Color m_tileDebugBorderColor;

  • trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm

    r158704 r158859  
    6767    , m_tilesAreOpaque(false)
    6868    , m_clipsToExposedRect(false)
     69    , m_hasTilesWithTemporaryScaleFactor(false)
    6970    , m_tileDebugBorderWidth(0)
    7071    , m_indicatorMode(ThreadedScrollingIndication)
    … …  
    213214    scale /= deviceScaleFactor;
    214215
    215     if (m_scale == scale && m_deviceScaleFactor == deviceScaleFactor)
    216         return;
    217 
     216    if (m_scale == scale && m_deviceScaleFactor == deviceScaleFactor && !m_hasTilesWithTemporaryScaleFactor)
     217        return;
     218
     219    m_hasTilesWithTemporaryScaleFactor = false;
    218220    m_deviceScaleFactor = deviceScaleFactor;
    219221    m_scale = scale;
    … …  
    946948#endif
    947949
    948     layer->setContentsScale(m_deviceScaleFactor);
     950    float temporaryScaleFactor = owningGraphicsLayer()->platformCALayerContentsScaleMultiplierForNewTiles(m_tileCacheLayer);
     951    m_hasTilesWithTemporaryScaleFactor |= temporaryScaleFactor != 1;
     952
     953    layer->setContentsScale(m_deviceScaleFactor * temporaryScaleFactor);
    949954    layer->setAcceleratesDrawing(m_acceleratesDrawing);
    950955

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r158163 r158859  
    21172117}
    21182118
     2119float RenderLayerBacking::contentsScaleMultiplierForNewTiles(const GraphicsLayer* layer) const
     2120{
     2121    return compositor().contentsScaleMultiplierForNewTiles(layer);
     2122}
     2123
    21192124void RenderLayerBacking::didCommitChangesForLayer(const GraphicsLayer* layer) const
    21202125{

  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r157725 r158859  
    166166
    167167    virtual float deviceScaleFactor() const OVERRIDE;
     168    virtual float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const OVERRIDE;
     169
    168170    virtual float pageScaleFactor() const OVERRIDE;
    169171    virtual void didCommitChangesForLayer(const GraphicsLayer*) const OVERRIDE;

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r158163 r158859  
    24812481}
    24822482
     2483float RenderLayerCompositor::contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const
     2484{
     2485    return 1;
     2486}
     2487
    24832488void RenderLayerCompositor::didCommitChangesForLayer(const GraphicsLayer*) const
    24842489{

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.h

    r157725 r158859  
    245245
    246246    virtual float deviceScaleFactor() const OVERRIDE;
     247    virtual float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const OVERRIDE;
    247248    virtual float pageScaleFactor() const OVERRIDE;
    248249    virtual void didCommitChangesForLayer(const GraphicsLayer*) const OVERRIDE;
Note: See TracChangeset for help on using the changeset viewer.