Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/svg/SVGLayoutSupport.h

 /**
  * Copyright (C) 2007 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) 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
@@ skipping 19 matching lines @@
 
 class AffineTransform;
 class FloatPoint;
 class FloatRect;
 class GraphicsContext;
 class GraphicsContextStateSaver;
 class PaintInvalidationState;
 class LayoutRect;
 struct PaintInfo;
 class LayoutGeometryMap;
-class LayoutLayerModelObject;
+class RenderBoxModelObject;
 class LayoutObject;
 class LayoutStyle;
 class LayoutSVGRoot;
 class StrokeData;
 class TransformState;
 
 class SVGLayoutSupport {
 public:
     // Shares child layouting code between LayoutSVGRoot/LayoutSVG(Hidden)Container
     static void layoutChildren(LayoutObject*, bool selfNeedsLayout);
@@ skipping 14 matching lines @@
     static bool pointInClippingArea(LayoutObject*, const FloatPoint&);
 
     // Transform |pointInParent| to |object|'s user-space and check if it is
     // within the clipping area. Returns false if the transform is singular or
     // the point is outside the clipping area.
     static bool transformToUserSpaceAndCheckClipping(LayoutObject*, const AffineTransform& localTransform, const FloatPoint& pointInParent, FloatPoint& localPoint);
 
     static void computeContainerBoundingBoxes(const LayoutObject* container, FloatRect& objectBoundingBox, bool& objectBoundingBoxValid, FloatRect& strokeBoundingBox, FloatRect& paintInvalidationBoundingBox);
 
     // Important functions used by nearly all SVG renderers centralizing coordinate transformations / paint invalidation rect calculations
-    static LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutObject*, const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState*);
+    static LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutObject*, const RenderBoxModelObject* paintInvalidationContainer, const PaintInvalidationState*);
     static const LayoutSVGRoot& mapRectToSVGRootForPaintInvalidation(const LayoutObject*, const FloatRect& localPaintInvalidationRect, LayoutRect&);
-    static void mapLocalToContainer(const LayoutObject*, const LayoutLayerModelObject* paintInvalidationContainer, TransformState&, bool* wasFixed = 0, const PaintInvalidationState* = 0);
-    static const LayoutObject* pushMappingToContainer(const LayoutObject*, const LayoutLayerModelObject* ancestorToStopAt, LayoutGeometryMap&);
+    static void mapLocalToContainer(const LayoutObject*, const RenderBoxModelObject* paintInvalidationContainer, TransformState&, bool* wasFixed = 0, const PaintInvalidationState* = 0);
+    static const LayoutObject* pushMappingToContainer(const LayoutObject*, const RenderBoxModelObject* ancestorToStopAt, LayoutGeometryMap&);
 
     // Shared between SVG renderers and resources.
     static void applyStrokeStyleToContext(GraphicsContext&, const LayoutStyle&, const LayoutObject&);
     static void applyStrokeStyleToStrokeData(StrokeData&, const LayoutStyle&, const LayoutObject&);
 
     // Update the GC state (on |paintInfo.context|) for painting |renderer|
     // using |style|. |resourceMode| is used to decide between fill/stroke.
     // Previous state will be saved (if needed) using |stateSaver|.
     static bool updateGraphicsContext(const PaintInfo&, GraphicsContextStateSaver&, const LayoutStyle&, LayoutObject&, LayoutSVGResourceMode, const AffineTransform* additionalPaintServerTransform = 0);
 
@@ skipping 38 matching lines @@
             return true;
         if (child->hasNonIsolatedBlendingDescendants() && !willIsolateBlendingDescendantsForObject(child))
             return true;
     }
     return false;
 }
 
 } // namespace blink
 
 #endif // SVGLayoutSupport_h