Move rendering/RenderObject to layout/LayoutObject.

Source/core/css/CSSImageGeneratorValue.h

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 #include "core/css/CSSValue.h"
 #include "platform/geometry/IntSizeHash.h"
 #include "wtf/HashCountedSet.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class ResourceFetcher;
 class Image;
-class RenderObject;
+class LayoutObject;
 
 struct SizeAndCount {
     SizeAndCount(IntSize newSize = IntSize(), int newCount = 0)
         : size(newSize)
         , count(newCount)
     {
     }
 
     IntSize size;
     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*);
 
     void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(visitor); }
 
 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
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageGeneratorValue, isImageGeneratorValue());
 
 } // namespace blink
 
 #endif // CSSImageGeneratorValue_h