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

third_party/WebKit/WebCore/rendering/RenderContainer.h

 /*
  * Copyright (C) 2001 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 45 matching lines @@
 
     RenderObject* beforeAfterContainer(RenderStyle::PseudoId);
     virtual void updateBeforeAfterContent(RenderStyle::PseudoId);
     void updateBeforeAfterContentForContainer(RenderStyle::PseudoId, RenderContainer*);
     bool isAfterContent(RenderObject* child) const;
     virtual void invalidateCounters();
 
     virtual VisiblePosition positionForCoordinates(int x, int y);
 
     virtual void addLineBoxRects(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
+    virtual void collectAbsoluteLineBoxQuads(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
 
 private:
     RenderObject* m_firstChild;
     RenderObject* m_lastChild;
 };
 
 } // namespace WebCore
 
 #endif // RenderContainer_h