Move rendering/RenderLayer* to layout/

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
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/rendering/svg/SVGRenderingContext.h"
 
 #include "core/frame/FrameHost.h"
+#include "core/layout/Layer.h"
 #include "core/paint/RenderDrawingRecorder.h"
 #include "core/rendering/PaintInfo.h"
-#include "core/rendering/RenderLayer.h"
 #include "core/rendering/svg/RenderSVGResourceFilter.h"
 #include "core/rendering/svg/RenderSVGResourceMasker.h"
 #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()
@@ skipping 57 matching lines @@
     if (!isIsolationInstalled() && SVGRenderSupport::isIsolationRequired(m_object))
         m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), m_paintInfo.context->compositeOperationDeprecated(), WebBlendModeNormal, 1, m_paintInfo.context->compositeOperationDeprecated()));
 
     return true;
 }
 
 void SVGRenderingContext::applyCompositingIfNecessary()
 {
     ASSERT(!m_paintInfo.isRenderingClipPathAsMaskImage());
 
-    // RenderLayer takes care of root opacity and blend mode.
+    // Layer takes care of root opacity and blend mode.
     if (m_object->isSVGRoot())
         return;
 
     RenderStyle* style = m_object->style();
     ASSERT(style);
     float opacity = style->opacity();
     bool hasBlendMode = style->hasBlendMode() && m_object->isBlendingAllowed();
     if (opacity < 1 || hasBlendMode) {
         m_clipRecorder = adoptPtr(new FloatClipRecorder(*m_paintInfo.context, m_object->displayItemClient(), m_paintInfo.phase, m_object->paintInvalidationRectInLocalCoordinates()));
         WebBlendMode blendMode = hasBlendMode ? style->blendMode() : WebBlendModeNormal;
@@ skipping 99 matching lines @@
     while (renderer) {
         ctm = renderer->localToParentTransform() * ctm;
         if (renderer->isSVGRoot())
             break;
         renderer = renderer->parent();
     }
 
     // Continue walking up the layer tree, accumulating CSS transforms.
     // FIXME: this queries layer compositing state - which is not
     // supported during layout. Hence, the result may not include all CSS transforms.
-    RenderLayer* layer = renderer ? renderer->enclosingLayer() : 0;
+    Layer* layer = renderer ? renderer->enclosingLayer() : 0;
     while (layer && layer->isAllowedToQueryCompositingState()) {
         // We can stop at compositing layers, to match the backing resolution.
         // FIXME: should we be computing the transform to the nearest composited layer,
         // or the nearest composited layer that does not paint into its ancestor?
         // I think this is the nearest composited ancestor since we will inherit its
         // transforms in the composited layer tree.
         if (layer->compositingState() != NotComposited)
             break;
 
         if (TransformationMatrix* layerTransform = layer->transform())
@@ skipping 11 matching lines @@
 {
     ASSERT(context);
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
     item->paint(info, IntPoint());
 }
 
 } // namespace blink