Changeset 183242 in webkit


Ignore:
Timestamp:
Apr 23, 2015, 9:36:12 PM (10 years ago)
Author:
Simon Fraser
Message:

Make it possible to detach GraphicsLayerCA backing store
​https://bugs.webkit.org/show_bug.cgi?id=144140

Reviewed by Tim Horton.
Source/WebCore:

This changes makes it possible to denote a GraphicsLayerCA's backing store
as "attached" or not. When not attached, the backing store is made volatile
and can be purged. This will be used in a future patch.

  • platform/graphics/ca/GraphicsLayerCA.h: Add updateBackingStoreAttachment().
  • platform/graphics/ca/PlatformCALayer.h:
  • platform/graphics/ca/mac/PlatformCALayerMac.h:
  • platform/graphics/ca/mac/PlatformCALayerMac.mm: Stubs. In future, we could

remove backing store on Mac and iOS WK1 too.
(PlatformCALayerMac::setBackingStoreAttached):
(PlatformCALayerMac::backingStoreAttached):

Source/WebKit2:

This changes makes it possible to denote a GraphicsLayerCA's backing store
as "attached" or not. When not attached, the backing store is made volatile
and can be purged. This will be used in a future patch.

  • Shared/mac/RemoteLayerBackingStore.mm:

(WebKit::RemoteLayerBackingStore::~RemoteLayerBackingStore): Whitespace.
(WebKit::RemoteLayerBackingStore::display): If backingStoreWillBeDisplayed()
returns true, this indicates that the backing store was brought out of the
"unreachable" list, so return true even if the backing store doesn't require
painting.

  • Shared/mac/RemoteLayerBackingStoreCollection.h: C++11 initializer, and comments.
  • Shared/mac/RemoteLayerBackingStoreCollection.mm:

(WebKit::RemoteLayerBackingStoreCollection::RemoteLayerBackingStoreCollection):
(WebKit::RemoteLayerBackingStoreCollection::backingStoreWillBeDisplayed): Return true
if the caller will need to submit the backing store in the current transaction.
(WebKit::RemoteLayerBackingStoreCollection::backingStoreBecameUnreachable): This
explicit dirtying is no longer necessary given the backingStoreWillBeDisplayed() change.

  • Shared/mac/RemoteLayerTreePropertyApplier.mm:

(WebKit::applyPropertiesToLayer): Only set the layer's backing if we both have backing
store, and it's attached.

  • Shared/mac/RemoteLayerTreeTransaction.h: New bit, and data member.
  • Shared/mac/RemoteLayerTreeTransaction.mm:

(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):

  • WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::recursiveBuildTransaction): Only call display()
on the backing store if it's attached.
(WebKit::PlatformCALayerRemote::setBackingStoreAttached):
(WebKit::PlatformCALayerRemote::backingStoreAttached):

  • WebProcess/WebPage/mac/PlatformCALayerRemote.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:

(WebKit::RemoteLayerTreeContext::backingStoreWillBeDisplayed):

Location:
trunk/Source
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r183241 r183242  
     12015-04-23  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make it possible to detach GraphicsLayerCA backing store
     4        https://bugs.webkit.org/show_bug.cgi?id=144140
     5
     6        Reviewed by Tim Horton.
     7
     8        This changes makes it possible to denote a GraphicsLayerCA's backing store
     9        as "attached" or not. When not attached, the backing store is made volatile
     10        and can be purged. This will be used in a future patch.
     11
     12        * platform/graphics/ca/GraphicsLayerCA.h: Add updateBackingStoreAttachment().
     13        * platform/graphics/ca/PlatformCALayer.h:
     14        * platform/graphics/ca/mac/PlatformCALayerMac.h:
     15        * platform/graphics/ca/mac/PlatformCALayerMac.mm: Stubs. In future, we could
     16        remove backing store on Mac and iOS WK1 too.
     17        (PlatformCALayerMac::setBackingStoreAttached):
     18        (PlatformCALayerMac::backingStoreAttached):
     19
    1202015-04-23  Simon Fraser  <simon.fraser@apple.com>
    221

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

    r183241 r183242  
    364364    void updateStructuralLayer();
    365365    void updateDrawsContent();
     366    void updateBackingStoreAttachment();
    366367    void updateBackgroundColor();
    367368

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

    r180965 r183242  
    177177    virtual void setContentsRect(const FloatRect&) = 0;
    178178
     179    virtual void setBackingStoreAttached(bool) = 0;
     180    virtual bool backingStoreAttached() const = 0;
     181
    179182    virtual void setMinificationFilter(FilterType) = 0;
    180183    virtual void setMagnificationFilter(FilterType) = 0;

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

    r180882 r183242  
    8989
    9090    virtual void setHidden(bool) override;
     91
     92    virtual void setBackingStoreAttached(bool) override;
     93    virtual bool backingStoreAttached() const override;
    9194
    9295    WEBCORE_EXPORT virtual void setGeometryFlipped(bool) override;

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

    r182516 r183242  
    595595}
    596596
     597void PlatformCALayerMac::setBackingStoreAttached(bool)
     598{
     599    // We could throw away backing store here with setContents:nil.
     600}
     601
     602bool PlatformCALayerMac::backingStoreAttached() const
     603{
     604    return true;
     605}
     606
    597607void PlatformCALayerMac::setGeometryFlipped(bool value)
    598608{

  • trunk/Source/WebKit2/ChangeLog

    r183228 r183242  
     12015-04-23  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make it possible to detach GraphicsLayerCA backing store
     4        https://bugs.webkit.org/show_bug.cgi?id=144140
     5
     6        Reviewed by Tim Horton.
     7       
     8        This changes makes it possible to denote a GraphicsLayerCA's backing store
     9        as "attached" or not. When not attached, the backing store is made volatile
     10        and can be purged. This will be used in a future patch.
     11
     12        * Shared/mac/RemoteLayerBackingStore.mm:
     13        (WebKit::RemoteLayerBackingStore::~RemoteLayerBackingStore): Whitespace.
     14        (WebKit::RemoteLayerBackingStore::display): If backingStoreWillBeDisplayed()
     15        returns true, this indicates that the backing store was brought out of the
     16        "unreachable" list, so return true even if the backing store doesn't require
     17        painting.
     18        * Shared/mac/RemoteLayerBackingStoreCollection.h: C++11 initializer, and comments.
     19        * Shared/mac/RemoteLayerBackingStoreCollection.mm:
     20        (WebKit::RemoteLayerBackingStoreCollection::RemoteLayerBackingStoreCollection):
     21        (WebKit::RemoteLayerBackingStoreCollection::backingStoreWillBeDisplayed): Return true
     22        if the caller will need to submit the backing store in the current transaction.
     23        (WebKit::RemoteLayerBackingStoreCollection::backingStoreBecameUnreachable): This
     24        explicit dirtying is no longer necessary given the backingStoreWillBeDisplayed() change.
     25        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
     26        (WebKit::applyPropertiesToLayer): Only set the layer's backing if we both have backing
     27        store, and it's attached.
     28        * Shared/mac/RemoteLayerTreeTransaction.h: New bit, and data member.
     29        * Shared/mac/RemoteLayerTreeTransaction.mm:
     30        (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
     31        (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
     32        (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
     33        (WebKit::dumpChangedLayers):
     34        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
     35        (WebKit::PlatformCALayerRemote::recursiveBuildTransaction): Only call display()
     36        on the backing store if it's attached.
     37        (WebKit::PlatformCALayerRemote::setBackingStoreAttached):
     38        (WebKit::PlatformCALayerRemote::backingStoreAttached):
     39        * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
     40        * WebProcess/WebPage/mac/RemoteLayerTreeContext.h:
     41        * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
     42        (WebKit::RemoteLayerTreeContext::backingStoreWillBeDisplayed):
     43
    1442015-04-23  Tim Horton  <timothy_horton@apple.com>
    245

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

    r180965 r183242  
    6767    if (!m_layer)
    6868        return;
     69
    6970    if (RemoteLayerTreeContext* context = m_layer->context())
    7071        context->backingStoreWillBeDestroyed(*this);
    … …  
    207208    m_lastDisplayTime = std::chrono::steady_clock::now();
    208209
     210    bool needToEncodeBackingStore = false;
    209211    if (RemoteLayerTreeContext* context = m_layer->context())
    210         context->backingStoreWillBeDisplayed(*this);
     212        needToEncodeBackingStore = context->backingStoreWillBeDisplayed(*this);
    211213
    212214    // Make the previous front buffer non-volatile early, so that we can dirty the whole layer if it comes back empty.
    … …  
    216218
    217219    if (m_dirtyRegion.isEmpty() || expandedScaledSize.isEmpty())
    218         return false;
     220        return needToEncodeBackingStore;
    219221
    220222    IntRect layerBounds(IntPoint(), expandedIntSize(m_size));

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h

    r176459 r183242  
    4646    void backingStoreWillBeDestroyed(RemoteLayerBackingStore&);
    4747
    48     void backingStoreWillBeDisplayed(RemoteLayerBackingStore&);
     48    // Return value indicates whether the backing store needs to be included in the transaction.
     49    bool backingStoreWillBeDisplayed(RemoteLayerBackingStore&);
    4950    void backingStoreBecameUnreachable(RemoteLayerBackingStore&);
    5051
    … …  
    6869    HashSet<RemoteLayerBackingStore*> m_liveBackingStore;
    6970    HashSet<RemoteLayerBackingStore*> m_unparentedBackingStore;
     71
     72    // Only used during a single flush.
    7073    HashSet<RemoteLayerBackingStore*> m_reachableBackingStoreInLatestFlush;
    7174
    7275    WebCore::Timer m_volatilityTimer;
    7376
    74     bool m_inLayerFlush;
     77    bool m_inLayerFlush { false };
    7578};
    7679

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm

    r176459 r183242  
    3939RemoteLayerBackingStoreCollection::RemoteLayerBackingStoreCollection()
    4040    : m_volatilityTimer(*this, &RemoteLayerBackingStoreCollection::volatilityTimerFired)
    41     , m_inLayerFlush(false)
    4241{
    4342}
    … …  
    8988}
    9089
    91 void RemoteLayerBackingStoreCollection::backingStoreWillBeDisplayed(RemoteLayerBackingStore& backingStore)
     90bool RemoteLayerBackingStoreCollection::backingStoreWillBeDisplayed(RemoteLayerBackingStore& backingStore)
    9291{
    9392    ASSERT(m_inLayerFlush);
    … …  
    9695    auto backingStoreIter = m_unparentedBackingStore.find(&backingStore);
    9796    if (backingStoreIter == m_unparentedBackingStore.end())
    98         return;
     97        return false;
     98
    9999    m_liveBackingStore.add(&backingStore);
    100100    m_unparentedBackingStore.remove(backingStoreIter);
     101    return true;
    101102}
    102103
    … …  
    142143    m_liveBackingStore.remove(backingStoreIter);
    143144
    144     // If a layer with backing store is removed from the tree, mark it as having changed backing store, so that
    145     // on the commit which returns it to the tree, we serialize the backing store (despite possibly not painting).
    146     backingStore.layer()->properties().notePropertiesChanged(RemoteLayerTreeTransaction::BackingStoreChanged);
    147 
    148145    // This will not succeed in marking all buffers as volatile, because the commit unparenting the layer hasn't
    149146    // made it to the UI process yet. The volatility timer will finish marking the remaining buffers later.

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm

    r180965 r183242  
    234234        layer.timeOffset = properties.timeOffset;
    235235
    236     if (properties.changedProperties & RemoteLayerTreeTransaction::BackingStoreChanged) {
    237         if (RemoteLayerBackingStore* backingStore = properties.backingStore.get())
     236    if (properties.changedProperties & RemoteLayerTreeTransaction::BackingStoreChanged
     237        || properties.changedProperties & RemoteLayerTreeTransaction::BackingStoreAttachmentChanged)
     238    {
     239        RemoteLayerBackingStore* backingStore = properties.backingStore.get();
     240        if (backingStore && properties.backingStoreAttached)
    238241            backingStore->applyBackingStoreToLayer(layer);
    239242        else {

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h

    r180882 r183242  
    8282        TimeOffsetChanged               = 1LLU << 29,
    8383        BackingStoreChanged             = 1LLU << 30,
    84         FiltersChanged                  = 1LLU << 31,
    85         AnimationsChanged               = 1LLU << 32,
    86         EdgeAntialiasingMaskChanged     = 1LLU << 33,
    87         CustomAppearanceChanged         = 1LLU << 34
     84        BackingStoreAttachmentChanged   = 1LLU << 31,
     85        FiltersChanged                  = 1LLU << 32,
     86        AnimationsChanged               = 1LLU << 33,
     87        EdgeAntialiasingMaskChanged     = 1LLU << 34,
     88        CustomAppearanceChanged         = 1LLU << 35,
    8889    };
    8990    typedef uint64_t LayerChange;
    … …  
    157158        WebCore::WindRule windRule;
    158159        bool hidden;
     160        bool backingStoreAttached;
    159161        bool geometryFlipped;
    160162        bool doubleSided;

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

    r181191 r183242  
    9999    , windRule(RULE_NONZERO)
    100100    , hidden(false)
     101    , backingStoreAttached(true)
    101102    , geometryFlipped(false)
    102103    , doubleSided(true)
    … …  
    135136    , windRule(other.windRule)
    136137    , hidden(other.hidden)
     138    , backingStoreAttached(other.backingStoreAttached)
    137139    , geometryFlipped(other.geometryFlipped)
    138140    , doubleSided(other.doubleSided)
    … …  
    255257            encoder << *backingStore;
    256258    }
     259
     260    if (changedProperties & BackingStoreAttachmentChanged)
     261        encoder << backingStoreAttached;
    257262
    258263    if (changedProperties & FiltersChanged)
    … …  
    453458        } else
    454459            result.backingStore = nullptr;
     460    }
     461
     462    if (result.changedProperties & BackingStoreAttachmentChanged) {
     463        if (!decoder.decode(result.backingStoreAttached))
     464            return false;
    455465    }
    456466
    … …  
    11821192        }
    11831193
     1194        if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BackingStoreAttachmentChanged)
     1195            dumpProperty(ts, "backingStoreAttached", layerProperties.backingStoreAttached);
     1196
    11841197        if (layerProperties.changedProperties & RemoteLayerTreeTransaction::FiltersChanged)
    11851198            dumpProperty(ts, "filters", layerProperties.filters ? *layerProperties.filters : FilterOperations());

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

    r180882 r183242  
    154154    }
    155155
    156     if (m_properties.backingStore && m_properties.backingStore->display())
     156    if (m_properties.backingStore && m_properties.backingStoreAttached && m_properties.backingStore->display())
    157157        m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BackingStoreChanged);
    158158
    … …  
    503503}
    504504
     505void PlatformCALayerRemote::setBackingStoreAttached(bool value)
     506{
     507    if (m_properties.backingStoreAttached == value)
     508        return;
     509
     510    m_properties.backingStoreAttached = value;
     511    m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BackingStoreAttachmentChanged);
     512}
     513
     514bool PlatformCALayerRemote::backingStoreAttached() const
     515{
     516    return m_properties.backingStoreAttached;
     517}
     518
    505519void PlatformCALayerRemote::setGeometryFlipped(bool value)
    506520{

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

    r180882 r183242  
    9595    virtual void setHidden(bool) override;
    9696
     97    virtual void setBackingStoreAttached(bool) override;
     98    virtual bool backingStoreAttached() const override;
     99
    97100    virtual void setGeometryFlipped(bool) override;
    98101

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.h

    r179630 r183242  
    5252    void backingStoreWasCreated(RemoteLayerBackingStore&);
    5353    void backingStoreWillBeDestroyed(RemoteLayerBackingStore&);
    54     void backingStoreWillBeDisplayed(RemoteLayerBackingStore&);
     54    bool backingStoreWillBeDisplayed(RemoteLayerBackingStore&);
    5555
    5656    WebCore::LayerPool& layerPool() { return m_layerPool; }

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm

    r179630 r183242  
    9595}
    9696
    97 void RemoteLayerTreeContext::backingStoreWillBeDisplayed(RemoteLayerBackingStore& backingStore)
     97bool RemoteLayerTreeContext::backingStoreWillBeDisplayed(RemoteLayerBackingStore& backingStore)
    9898{
    99     m_backingStoreCollection.backingStoreWillBeDisplayed(backingStore);
     99    return m_backingStoreCollection.backingStoreWillBeDisplayed(backingStore);
    100100}
    101101
Note: See TracChangeset for help on using the changeset viewer.