Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/WebCore/rendering/RenderSVGContainer.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2007 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
     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.
@@ skipping 60 matching lines @@
 
     virtual bool requiresLayer();
     virtual int lineHeight(bool b, bool isRootLineBox = false) const;
     virtual int baselinePosition(bool b, bool isRootLineBox = false) const;
 
     virtual void layout();
     virtual void paint(PaintInfo&, int parentX, int parentY);
 
     virtual IntRect absoluteClippedOverflowRect();
     virtual void absoluteRects(Vector<IntRect>& rects, int tx, int ty, bool topLevel = true);
+    virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
 
     FloatRect relativeBBox(bool includeStroke = true) const;
 
     virtual bool calculateLocalTransform();
     virtual AffineTransform localTransform() const;
     virtual AffineTransform viewportTransform() const;
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
@@ skipping 21 matching lines @@
     IntRect m_absoluteBounds;
     AffineTransform m_localTransform;
 };
   
 } // namespace WebCore
 
 #endif // ENABLE(SVG)
 #endif // RenderSVGContainer_h
 
 // vim:ts=4:noet