Move rendering/RenderObject to layout/LayoutObject.

Source/core/css/CSSImageGeneratorValue.cpp

 /*
  * 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 24 matching lines @@
 
 CSSImageGeneratorValue::CSSImageGeneratorValue(ClassType classType)
     : CSSValue(classType)
 {
 }
 
 CSSImageGeneratorValue::~CSSImageGeneratorValue()
 {
 }
 
-void CSSImageGeneratorValue::addClient(RenderObject* renderer, const IntSize& size)
+void CSSImageGeneratorValue::addClient(LayoutObject* renderer, const IntSize& size)
 {
     ASSERT(renderer);
 #if !ENABLE(OILPAN)
     ref();
 #else
     if (m_clients.isEmpty()) {
         ASSERT(!m_keepAlive);
         m_keepAlive = adoptPtr(new Persistent<CSSImageGeneratorValue>(this));
     }
 #endif
 
     if (!size.isEmpty())
         m_sizes.add(size);
 
-    RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
+    LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
     if (it == m_clients.end())
         m_clients.add(renderer, SizeAndCount(size, 1));
     else {
         SizeAndCount& sizeCount = it->value;
         ++sizeCount.count;
     }
 }
 
-void CSSImageGeneratorValue::removeClient(RenderObject* renderer)
+void CSSImageGeneratorValue::removeClient(LayoutObject* renderer)
 {
     ASSERT(renderer);
-    RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
+    LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
     ASSERT_WITH_SECURITY_IMPLICATION(it != m_clients.end());
 
     IntSize removedImageSize;
     SizeAndCount& sizeCount = it->value;
     IntSize size = sizeCount.size;
     if (!size.isEmpty()) {
         m_sizes.remove(size);
         if (!m_sizes.contains(size))
             m_images.remove(size);
     }
 
     if (!--sizeCount.count)
         m_clients.remove(renderer);
 
 #if !ENABLE(OILPAN)
     deref();
 #else
     if (m_clients.isEmpty()) {
         ASSERT(m_keepAlive);
         m_keepAlive = nullptr;
     }
 #endif
 }
 
-Image* CSSImageGeneratorValue::getImage(RenderObject* renderer, const IntSize& size)
+Image* CSSImageGeneratorValue::getImage(LayoutObject* renderer, const IntSize& size)
 {
-    RenderObjectSizeCountMap::iterator it = m_clients.find(renderer);
+    LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
     if (it != m_clients.end()) {
         SizeAndCount& sizeCount = it->value;
         IntSize oldSize = sizeCount.size;
         if (oldSize != size) {
 #if !ENABLE_OILPAN
             RefPtr<CSSImageGeneratorValue> protect(this);
 #endif
             removeClient(renderer);
             addClient(renderer, size);
         }
     }
 
     // Don't generate an image for empty sizes.
     if (size.isEmpty())
         return 0;
 
     // Look up the image in our cache.
     return m_images.get(size);
 }
 
 void CSSImageGeneratorValue::putImage(const IntSize& size, PassRefPtr<Image> image)
 {
     m_images.add(size, image);
 }
 
-PassRefPtr<Image> CSSImageGeneratorValue::image(RenderObject* renderer, const IntSize& size)
+PassRefPtr<Image> CSSImageGeneratorValue::image(LayoutObject* renderer, const IntSize& size)
 {
     switch (classType()) {
     case CanvasClass:
         return toCSSCanvasValue(this)->image(renderer, size);
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->image(renderer, size);
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->image(renderer, size);
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->image(renderer, size);
@@ skipping 13 matching lines @@
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->isFixedSize();
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->isFixedSize();
     default:
         ASSERT_NOT_REACHED();
     }
     return false;
 }
 
-IntSize CSSImageGeneratorValue::fixedSize(const RenderObject* renderer)
+IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* renderer)
 {
     switch (classType()) {
     case CanvasClass:
         return toCSSCanvasValue(this)->fixedSize(renderer);
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->fixedSize(renderer);
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->fixedSize(renderer);
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->fixedSize(renderer);
@@ skipping 13 matching lines @@
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->isPending();
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->isPending();
     default:
         ASSERT_NOT_REACHED();
     }
     return false;
 }
 
-bool CSSImageGeneratorValue::knownToBeOpaque(const RenderObject* renderer) const
+bool CSSImageGeneratorValue::knownToBeOpaque(const LayoutObject* renderer) const
 {
     switch (classType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->knownToBeOpaque(renderer);
     case CanvasClass:
         return false;
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->knownToBeOpaque(renderer);
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->knownToBeOpaque(renderer);
@@ skipping 17 matching lines @@
         break;
     case RadialGradientClass:
         toCSSRadialGradientValue(this)->loadSubimages(fetcher);
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink