Title: [163279] trunk/Source/WebCore
- Revision
- 163279
- Author
- [email protected]
- Date
- 2014-02-02 18:15:13 -0800 (Sun, 02 Feb 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163278 => 163279)
--- trunk/Source/WebCore/ChangeLog 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 02:15:13 UTC (rev 163279)
@@ -1,3 +1,23 @@
+2014-02-02 Andreas Kling <[email protected]>
+
+ 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):
+
2014-02-02 Zalan Bujtas <[email protected]>
Subpixel rendering: Use floorf/roundf/fabs in device snapping helpers.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (163278 => 163279)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 02:15:13 UTC (rev 163279)
@@ -141,17 +141,15 @@
}
}
-void RenderSVGResourceContainer::addClient(RenderObject* client)
+void RenderSVGResourceContainer::addClient(RenderElement& client)
{
- ASSERT(client);
- m_clients.add(client);
+ m_clients.add(&client);
}
-void RenderSVGResourceContainer::removeClient(RenderObject* client)
+void RenderSVGResourceContainer::removeClient(RenderElement& client)
{
- ASSERT(client);
- removeClientFromCache(*client, false);
- m_clients.remove(client);
+ removeClientFromCache(client, false);
+ m_clients.remove(&client);
}
void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (163278 => 163279)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 02:15:13 UTC (rev 163279)
@@ -63,8 +63,8 @@
private:
friend class SVGResourcesCache;
- void addClient(RenderObject*);
- void removeClient(RenderObject*);
+ void addClient(RenderElement&);
+ void removeClient(RenderElement&);
private:
virtual void willBeDestroyed() override final;
@@ -73,7 +73,7 @@
AtomicString m_id;
bool m_registered : 1;
bool m_isInvalidating : 1;
- HashSet<RenderObject*> m_clients;
+ HashSet<RenderElement*> m_clients;
HashSet<RenderLayer*> m_clientLayers;
};
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (163278 => 163279)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 02:15:13 UTC (rev 163279)
@@ -58,8 +58,8 @@
HashSet<RenderSVGResourceContainer*> resourceSet;
resources.buildSetOfResources(resourceSet);
- for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
- (*it)->addClient(&renderer);
+ for (auto* resourceContainer : resourceSet)
+ resourceContainer->addClient(renderer);
}
void SVGResourcesCache::removeResourcesFromRenderer(RenderElement& renderer)
@@ -72,8 +72,8 @@
HashSet<RenderSVGResourceContainer*> resourceSet;
resources->buildSetOfResources(resourceSet);
- for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
- (*it)->removeClient(&renderer);
+ for (auto* resourceContainer : resourceSet)
+ resourceContainer->removeClient(renderer);
}
static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderObject& renderer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes