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

Unified Diff: Source/core/css/CSSImageGeneratorValue.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
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSImageGeneratorValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSImageGeneratorValue.h
diff --git a/Source/core/css/CSSImageGeneratorValue.h b/Source/core/css/CSSImageGeneratorValue.h
index 721626c351e578e65a867bbf6cedbc606ec68b05..fca1fc74acb8a415de3310fb3a055115d3b6ef78 100644
--- a/Source/core/css/CSSImageGeneratorValue.h
+++ b/Source/core/css/CSSImageGeneratorValue.h
@@ -35,7 +35,7 @@ namespace blink {
class ResourceFetcher;
class Image;
-class RenderObject;
+class LayoutObject;
struct SizeAndCount {
SizeAndCount(IntSize newSize = IntSize(), int newCount = 0)
@@ -48,21 +48,21 @@ struct SizeAndCount {
int count;
};
-typedef HashMap<const RenderObject*, SizeAndCount> RenderObjectSizeCountMap;
+typedef HashMap<const LayoutObject*, SizeAndCount> LayoutObjectSizeCountMap;
class CSSImageGeneratorValue : public CSSValue {
public:
~CSSImageGeneratorValue();
- void addClient(RenderObject*, const IntSize&);
- void removeClient(RenderObject*);
- PassRefPtr<Image> image(RenderObject*, const IntSize&);
+ void addClient(LayoutObject*, const IntSize&);
+ void removeClient(LayoutObject*);
+ PassRefPtr<Image> image(LayoutObject*, const IntSize&);
bool isFixedSize() const;
- IntSize fixedSize(const RenderObject*);
+ IntSize fixedSize(const LayoutObject*);
bool isPending() const;
- bool knownToBeOpaque(const RenderObject*) const;
+ bool knownToBeOpaque(const LayoutObject*) const;
void loadSubimages(ResourceFetcher*);
@@ -71,18 +71,18 @@ public:
protected:
explicit CSSImageGeneratorValue(ClassType);
- Image* getImage(RenderObject*, const IntSize&);
+ Image* getImage(LayoutObject*, const IntSize&);
void putImage(const IntSize&, PassRefPtr<Image>);
- const RenderObjectSizeCountMap& clients() const { return m_clients; }
+ const LayoutObjectSizeCountMap& clients() const { return m_clients; }
HashCountedSet<IntSize> m_sizes; // A count of how many times a given image size is in use.
- RenderObjectSizeCountMap m_clients; // A map from RenderObjects (with entry count) to image sizes.
+ LayoutObjectSizeCountMap m_clients; // A map from LayoutObjects (with entry count) to image sizes.
HashMap<IntSize, RefPtr<Image> > m_images; // A cache of Image objects by image size.
#if ENABLE(OILPAN)
// FIXME: Oilpan: when/if we can make the renderer point directly to the CSSImageGenerator value using
// a member we don't need to have this hack where we keep a persistent to the instance as long as
- // there are clients in the RenderObjectSizeCountMap.
+ // there are clients in the LayoutObjectSizeCountMap.
GC_PLUGIN_IGNORE("366546")
OwnPtr<Persistent<CSSImageGeneratorValue> > m_keepAlive;
#endif
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSImageGeneratorValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698