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

third_party/WebKit/WebCore/rendering/RenderContainer.cpp

Index: third_party/WebKit/WebCore/rendering/RenderContainer.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderContainer.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/rendering/RenderContainer.cpp	(working copy)
@@ -679,6 +679,23 @@
     }
 }
 
+void RenderContainer::collectAbsoluteLineBoxQuads(Vector<FloatQuad>& quads, unsigned start, unsigned end, bool useSelectionHeight)
+{
+    if (!m_firstChild && (isInline() || isAnonymousBlock())) {
+        absoluteQuads(quads);
+        return;
+    }
+
+    if (!m_firstChild)
+        return;
+
+    unsigned offset = start;
+    for (RenderObject* child = childAt(start); child && offset < end; child = child->nextSibling(), ++offset) {
+        if (child->isText() || child->isInline() || child->isAnonymousBlock())
+            child->absoluteQuads(quads);
+    }
+}
+
 #undef DEBUG_LAYOUT
 
 } // namespace WebCore