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

third_party/WebKit/WebCore/rendering/RenderView.cpp

Index: third_party/WebKit/WebCore/rendering/RenderView.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderView.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/rendering/RenderView.cpp	(working copy)
@@ -147,6 +147,15 @@
     return containerPoint;
 }
 
+FloatQuad RenderView::localToAbsoluteQuad(const FloatQuad& localQuad, bool fixed) const
+{
+    FloatQuad quad = localQuad;
+    if (fixed && m_frameView)
+        quad += m_frameView->scrollOffset();
+
+    return quad;
+}
+
 void RenderView::paint(PaintInfo& paintInfo, int tx, int ty)
 {
     // If we ever require layout but receive a paint anyway, something has gone horribly wrong.
@@ -242,6 +251,11 @@
     rects.append(IntRect(tx, ty, m_layer->width(), m_layer->height()));
 }
 
+void RenderView::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
+{
+    quads.append(FloatRect(0, 0, m_layer->width(), m_layer->height()));
+}
+
 RenderObject* rendererAfterPosition(RenderObject* object, unsigned offset)
 {
     if (!object)