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

third_party/WebKit/WebCore/rendering/RenderBox.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 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.
  *
@@ skipping 33 matching lines @@
     virtual int minPrefWidth() const;
     virtual int maxPrefWidth() const;
 
     virtual int overrideSize() const;
     virtual int overrideWidth() const;
     virtual int overrideHeight() const;
     virtual void setOverrideSize(int);
 
     virtual FloatPoint localToAbsolute(FloatPoint localPoint = FloatPoint(), bool fixed = false, bool useTransforms = false) const;
     virtual FloatPoint absoluteToLocal(FloatPoint containerPoint, bool fixed = false, bool useTransforms = false) const;
+    virtual FloatQuad localToAbsoluteQuad(const FloatQuad&, bool fixed = false) const;
 
     virtual int xPos() const { return m_x; }
     virtual int yPos() const { return m_y; }
     virtual void setPos(int x, int y);
 
     virtual int width() const { return m_width; }
     virtual int height() const { return m_height; }
     virtual void setWidth(int width) { m_width = width; }
     virtual void setHeight(int height) { m_height = height; }
 
@@ skipping 183 matching lines @@
 
 private:
     // Used to store state between styleWillChange and styleDidChange
     static bool s_wasFloating;
     static bool s_hadOverflowClip;
 };
 
 } // namespace WebCore
 
 #endif // RenderBox_h