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

third_party/WebKit/WebCore/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. 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.
  *
  */
 
 #ifndef RenderObject_h
 #define RenderObject_h
 
 #include "CachedResourceClient.h"
 #include "Document.h"
+#include "FloatQuad.h"
 #include "RenderStyle.h"
 #include "ScrollTypes.h"
 #include "VisiblePosition.h"
 #include <wtf/HashMap.h>
 
 namespace WebCore {
 
 class AffineTransform;
 class AnimationController;
 class Color;
@@ skipping 514 matching lines @@
     // returns the containing block level element for this element.
     RenderBlock* containingBlock() const;
 
     // return just the width of the containing block
     virtual int containingBlockWidth() const;
     // return just the height of the containing block
     virtual int containingBlockHeight() const;
 
     // content area (box minus padding/border)
     IntRect contentBox() const;
+    // absolute coords of content area. Ignores transforms.
     IntRect absoluteContentBox() const;
+    // content rect converted to absolute coords, taking transforms into account
+    FloatQuad absoluteContentQuad() const;
+    
     int contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); }
     int contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); }
 
     // used by flexible boxes to impose a flexed width/height override
     virtual int overrideSize() const { return 0; }
     virtual int overrideWidth() const { return 0; }
     virtual int overrideHeight() const { return 0; }
     virtual void setOverrideSize(int /*overrideSize*/) { }
 
     // relative to parent node
@@ skipping 12 matching lines @@
 
     // This function is used to deal with the extra top space that can occur in table cells (called borderTopExtra).
     // The children of the cell do not factor this space in, so we have to add it in.  Any code that wants to
     // accurately deal with the contents of a cell must call this function instad of absolutePosition.
     FloatPoint localToAbsoluteForContent(FloatPoint localPoint = FloatPoint(), bool fixed = false, bool useTransforms = false) const
     {
         localPoint.move(0.0f, static_cast<float>(borderTopExtra()));
         return localToAbsolute(localPoint, fixed, useTransforms);
     }
 
+    // Convert a local quad to an absolute quad, taking transforms into account.
+    virtual FloatQuad localToAbsoluteQuad(const FloatQuad&, bool fixed = false) const;
+
     // width and height are without margins but include paddings and borders
     virtual int width() const { return 0; }
     virtual int height() const { return 0; }
 
     virtual IntRect borderBox() const { return IntRect(0, 0, width(), height()); }
     IntRect absoluteOutlineBox() const;
 
     // The height of a block when you include normal flow overflow spillage out of the bottom
     // of the block (e.g., a <div style="height:25px"> that has a 100px tall image inside
     // it would have an overflow height of borderTop() + paddingTop() + 100px.
@@ skipping 73 matching lines @@
     virtual int borderTop() const { return style()->borderTopWidth(); }
     virtual int borderBottom() const { return style()->borderBottomWidth(); }
     virtual int borderTopExtra() const { return 0; }
     virtual int borderBottomExtra() const { return 0; }
     virtual int borderLeft() const { return style()->borderLeftWidth(); }
     virtual int borderRight() const { return style()->borderRightWidth(); }
 
     virtual void addLineBoxRects(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
 
     virtual void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLevel = true);
-    IntRect absoluteBoundingBoxRect();
+    // FIXME: useTransforms should go away eventually
+    IntRect absoluteBoundingBoxRect(bool useTransforms = false);
+
+    // Build an array of quads in absolute coords for line boxes
+    virtual void collectAbsoluteLineBoxQuads(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
+    virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);
 
     // the rect that will be painted if this object is passed as the paintingRoot
     IntRect paintingRootRect(IntRect& topLevelRect);
 
     void addPDFURLRect(GraphicsContext*, const IntRect&);
 
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
 
     virtual int minPrefWidth() const { return 0; }
     virtual int maxPrefWidth() const { return 0; }
@@ skipping 262 matching lines @@
 };
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::RenderObject*);
 #endif
 
 #endif // RenderObject_h