Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/svg/SVGResourcesCycleSolver.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 15 matching lines @@
 #include "core/rendering/svg/RenderSVGResourceClipper.h"
 #include "core/rendering/svg/RenderSVGResourceFilter.h"
 #include "core/rendering/svg/RenderSVGResourceMarker.h"
 #include "core/rendering/svg/RenderSVGResourceMasker.h"
 #include "core/rendering/svg/RenderSVGResourcePaintServer.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 
 namespace blink {
 
-SVGResourcesCycleSolver::SVGResourcesCycleSolver(RenderObject* renderer, SVGResources* resources)
+SVGResourcesCycleSolver::SVGResourcesCycleSolver(LayoutObject* renderer, SVGResources* resources)
     : m_renderer(renderer)
     , m_resources(resources)
 {
     ASSERT(m_renderer);
     ASSERT(m_resources);
 }
 
 SVGResourcesCycleSolver::~SVGResourcesCycleSolver()
 {
 }
@@ skipping 18 matching lines @@
 
 bool SVGResourcesCycleSolver::resourceContainsCycles(RenderSVGResourceContainer* resource)
 {
     // If we've traversed this sub-graph before and no cycles were observed, then
     // reuse that result.
     if (m_dagCache.contains(resource))
         return false;
 
     ActiveFrame frame(m_activeResources, resource);
 
-    RenderObject* node = resource;
+    LayoutObject* node = resource;
     while (node) {
         // Skip subtrees which are themselves resources. (They will be
         // processed - if needed - when they are actually referenced.)
         if (node != resource && node->isSVGResourceContainer()) {
             node = node->nextInPreOrderAfterChildren(resource);
             continue;
         }
-        if (SVGResources* nodeResources = SVGResourcesCache::cachedResourcesForRenderObject(node)) {
+        if (SVGResources* nodeResources = SVGResourcesCache::cachedResourcesForLayoutObject(node)) {
             // Fetch all the resources referenced by |node|.
             ResourceSet nodeSet;
             nodeResources->buildSetOfResources(nodeSet);
 
             // Iterate resources referenced by |node|.
             ResourceSet::iterator end = nodeSet.end();
             for (ResourceSet::iterator it = nodeSet.begin(); it != end; ++it) {
                 if (m_activeResources.contains(*it) || resourceContainsCycles(*it))
                     return true;
             }
         }
         node = node->nextInPreOrder(resource);
     }
 
     // No cycles found in (or from) this resource. Add it to the "DAG cache".
     m_dagCache.add(resource);
     return false;
 }
 
 void SVGResourcesCycleSolver::resolveCycles()
 {
     ASSERT(m_activeResources.isEmpty());
 
-    // If the starting RenderObject is a resource container itself, then add it
+    // If the starting LayoutObject is a resource container itself, then add it
     // to the active set (to break direct self-references.)
     if (m_renderer->isSVGResourceContainer())
         m_activeResources.add(toRenderSVGResourceContainer(m_renderer));
 
     ResourceSet localResources;
     m_resources->buildSetOfResources(localResources);
 
     // This performs a depth-first search for a back-edge in all the
     // (potentially disjoint) graphs formed by the resources referenced by
     // |m_renderer|.
@@ skipping 45 matching lines @@
         ASSERT(resourceLeadingToCycle == m_resources->clipper());
         m_resources->resetClipper();
         break;
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 }
 
 }