Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1734)

Unified Diff: Source/core/rendering/svg/RenderSVGResourceContainer.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/RenderSVGResourceContainer.h
diff --git a/Source/core/rendering/svg/RenderSVGResourceContainer.h b/Source/core/rendering/svg/RenderSVGResourceContainer.h
index d9ac94a864c53b43d540a0c9e0a954d4542ef8b6..25dc487733ca1161597c0ea10303bb6a7ca1303a 100644
--- a/Source/core/rendering/svg/RenderSVGResourceContainer.h
+++ b/Source/core/rendering/svg/RenderSVGResourceContainer.h
@@ -43,11 +43,11 @@ public:
virtual ~RenderSVGResourceContainer();
virtual void removeAllClientsFromCache(bool markForInvalidation = true) = 0;
- virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) = 0;
+ virtual void removeClientFromCache(LayoutObject*, bool markForInvalidation = true) = 0;
virtual void layout() override;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGResourceContainer || RenderSVGHiddenContainer::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVGResourceContainer || RenderSVGHiddenContainer::isOfType(type); }
virtual RenderSVGResourceType resourceType() const = 0;
@@ -66,7 +66,7 @@ public:
void invalidateCacheAndMarkForLayout(SubtreeLayoutScope* = 0);
- static void markForLayoutAndParentResourceInvalidation(RenderObject*, bool needsLayout = true);
+ static void markForLayoutAndParentResourceInvalidation(LayoutObject*, bool needsLayout = true);
protected:
// When adding modes, make sure we don't overflow m_invalidationMask below.
@@ -80,7 +80,7 @@ protected:
// Used from the invalidateClient/invalidateClients methods from classes, inheriting from us.
void markAllClientsForInvalidation(InvalidationMode);
void markAllClientLayersForInvalidation();
- void markClientForInvalidation(RenderObject*, InvalidationMode);
+ void markClientForInvalidation(LayoutObject*, InvalidationMode);
void clearInvalidationMask() { m_invalidationMask = 0; }
@@ -88,8 +88,8 @@ protected:
private:
friend class SVGResourcesCache;
- void addClient(RenderObject*);
- void removeClient(RenderObject*);
+ void addClient(LayoutObject*);
+ void removeClient(LayoutObject*);
virtual void willBeDestroyed() override final;
void registerResource();
@@ -102,7 +102,7 @@ private:
unsigned m_isInvalidating : 1;
// 22 padding bits available
- HashSet<RenderObject*> m_clients;
+ HashSet<LayoutObject*> m_clients;
HashSet<Layer*> m_clientLayers;
};
@@ -127,7 +127,7 @@ Renderer* getRenderSVGResourceById(TreeScope& treeScope, const AtomicString& id)
return 0;
}
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGResourceContainer, isSVGResourceContainer());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderSVGResourceContainer, isSVGResourceContainer());
#define DEFINE_RENDER_SVG_RESOURCE_TYPE_CASTS(thisType, typeName) \
DEFINE_TYPE_CASTS(thisType, RenderSVGResourceContainer, resource, resource->resourceType() == typeName, resource.resourceType() == typeName)
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceClipper.cpp ('k') | Source/core/rendering/svg/RenderSVGResourceContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698