Changeset 163279 in webkit


Ignore:
Timestamp:
Feb 2, 2014 6:15:13 PM (10 years ago)
Author:
akling@apple.com
Message:

RenderSVGResourceContainer clients are always RenderElement.
<https://webkit.org/b/128088>

All clients of RenderSVGResourceContainer are going to be RenderElement,
so make the interface take RenderElement& instead of RenderObject*.

Also modernized the code a bit with C++11 range for loops.

Reviewed by Sam Weinig.

  • rendering/svg/RenderSVGResourceContainer.cpp:

(WebCore::RenderSVGResourceContainer::addClient):
(WebCore::RenderSVGResourceContainer::removeClient):

  • rendering/svg/RenderSVGResourceContainer.h:
  • rendering/svg/SVGResourcesCache.cpp:

(WebCore::SVGResourcesCache::addResourcesFromRenderer):
(WebCore::SVGResourcesCache::removeResourcesFromRenderer):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r163278 r163279  
     12014-02-02  Andreas Kling  <akling@apple.com>
     2
     3        RenderSVGResourceContainer clients are always RenderElement.
     4        <https://webkit.org/b/128088>
     5
     6        All clients of RenderSVGResourceContainer are going to be RenderElement,
     7        so make the interface take RenderElement& instead of RenderObject*.
     8
     9        Also modernized the code a bit with C++11 range for loops.
     10
     11        Reviewed by Sam Weinig.
     12
     13        * rendering/svg/RenderSVGResourceContainer.cpp:
     14        (WebCore::RenderSVGResourceContainer::addClient):
     15        (WebCore::RenderSVGResourceContainer::removeClient):
     16        * rendering/svg/RenderSVGResourceContainer.h:
     17        * rendering/svg/SVGResourcesCache.cpp:
     18        (WebCore::SVGResourcesCache::addResourcesFromRenderer):
     19        (WebCore::SVGResourcesCache::removeResourcesFromRenderer):
     20
    1212014-02-02  Zalan Bujtas  <zalan@apple.com>
    222
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

    r163276 r163279  
    142142}
    143143
    144 void RenderSVGResourceContainer::addClient(RenderObject* client)
    145 {
    146     ASSERT(client);
    147     m_clients.add(client);
    148 }
    149 
    150 void RenderSVGResourceContainer::removeClient(RenderObject* client)
    151 {
    152     ASSERT(client);
    153     removeClientFromCache(*client, false);
    154     m_clients.remove(client);
     144void RenderSVGResourceContainer::addClient(RenderElement& client)
     145{
     146    m_clients.add(&client);
     147}
     148
     149void RenderSVGResourceContainer::removeClient(RenderElement& client)
     150{
     151    removeClientFromCache(client, false);
     152    m_clients.remove(&client);
    155153}
    156154
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h

    r162158 r163279  
    6464private:
    6565    friend class SVGResourcesCache;
    66     void addClient(RenderObject*);
    67     void removeClient(RenderObject*);
     66    void addClient(RenderElement&);
     67    void removeClient(RenderElement&);
    6868
    6969private:
     
    7474    bool m_registered : 1;
    7575    bool m_isInvalidating : 1;
    76     HashSet<RenderObject*> m_clients;
     76    HashSet<RenderElement*> m_clients;
    7777    HashSet<RenderLayer*> m_clientLayers;
    7878};
  • trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp

    r163277 r163279  
    5959    resources.buildSetOfResources(resourceSet);
    6060
    61     for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
    62         (*it)->addClient(&renderer);
     61    for (auto* resourceContainer : resourceSet)
     62        resourceContainer->addClient(renderer);
    6363}
    6464
     
    7373    resources->buildSetOfResources(resourceSet);
    7474
    75     for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
    76         (*it)->removeClient(&renderer);
     75    for (auto* resourceContainer : resourceSet)
     76        resourceContainer->removeClient(renderer);
    7777}
    7878
Note: See TracChangeset for help on using the changeset viewer.