Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/svg/SVGRenderingContext.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-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
@@ skipping 23 matching lines @@
 #include "core/rendering/svg/SVGRenderSupport.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "platform/FloatConversion.h"
 
 namespace blink {
 
 SVGRenderingContext::~SVGRenderingContext()
 {
     if (m_filter) {
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->filter() == m_filter);
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->filter() == m_filter);
 
         RenderDrawingRecorder recorder(m_originalPaintInfo->context, *m_object, DisplayItem::SVGFilter, LayoutRect::infiniteRect());
         if (!recorder.canUseCachedDrawing())
             m_filter->finishEffect(m_object, m_originalPaintInfo->context);
 
         // Reset the paint info after the filter effect has been completed.
         // This isn't strictly required (e.g., m_paintInfo.rect is not used
         // after this).
         m_paintInfo.context = m_originalPaintInfo->context;
         m_paintInfo.rect = m_originalPaintInfo->rect;
     }
 
     if (m_masker) {
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->masker() == m_masker);
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->masker() == m_masker);
         m_masker->finishEffect(m_object, m_paintInfo.context);
     }
 
     if (m_clipper) {
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
-        ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->clipper() == m_clipper);
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
+        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->clipper() == m_clipper);
         m_clipper->postApplyStatefulResource(m_object, m_paintInfo.context, m_clipperState);
     }
 }
 
 bool SVGRenderingContext::applyClipMaskAndFilterIfNecessary()
 {
 #if ENABLE(ASSERT)
     ASSERT(!m_applyClipMaskAndFilterIfNecessaryCalled);
     m_applyClipMaskAndFilterIfNecessaryCalled = true;
 #endif
 
-    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(m_object);
+    SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(m_object);
 
     // When rendering clip paths as masks, only geometric operations should be included so skip
     // non-geometric operations such as compositing, masking, and filtering.
     if (m_paintInfo.isRenderingClipPathAsMaskImage()) {
         if (!applyClipIfNecessary(resources))
             return false;
         return true;
     }
 
     applyCompositingIfNecessary();
@@ skipping 109 matching lines @@
     AffineTransform& contentTransformation = currentContentTransformation();
     m_savedContentTransformation = contentTransformation;
     contentTransformation = subtreeContentTransformation * contentTransformation;
 }
 
 SubtreeContentTransformScope::~SubtreeContentTransformScope()
 {
     currentContentTransformation() = m_savedContentTransformation;
 }
 
-float SVGRenderingContext::calculateScreenFontSizeScalingFactor(const RenderObject* renderer)
+float SVGRenderingContext::calculateScreenFontSizeScalingFactor(const LayoutObject* renderer)
 {
     // FIXME: trying to compute a device space transform at record time is wrong. All clients
     // should be updated to avoid relying on this information, and the method should be removed.
 
     ASSERT(renderer);
     // We're about to possibly clear renderer, so save the deviceScaleFactor now.
     float deviceScaleFactor = renderer->document().frameHost()->deviceScaleFactor();
 
     // Walk up the render tree, accumulating SVG transforms.
     AffineTransform ctm = currentContentTransformation();
@@ skipping 21 matching lines @@
             ctm = layerTransform->toAffineTransform() * ctm;
 
         layer = layer->parent();
     }
 
     ctm.scale(deviceScaleFactor);
 
     return narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
 }
 
-void SVGRenderingContext::renderSubtree(GraphicsContext* context, RenderObject* item)
+void SVGRenderingContext::renderSubtree(GraphicsContext* context, LayoutObject* item)
 {
     ASSERT(context);
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
     item->paint(info, IntPoint());
 }
 
 } // namespace blink