[New Multicolumn] Make computeOffsetFromCompositedAncestor() flowthread-aware.

Source/core/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 444 matching lines @@
     // Finally, make the visual rectangle relative to |ancestorLayer|.
     // FIXME: Handle nested fragmentation contexts (crbug.com/423076). For now just give up if there
     // are different pagination layers involved.
     if (!ancestorLayer->enclosingPaginationLayer() || ancestorLayer->enclosingPaginationLayer() != paginationLayer) {
         // The easy case. The ancestor layer is not within the pagination layer.
         paginationLayer->convertToLayerCoords(ancestorLayer, rect);
         return;
     }
     // The ancestor layer is also inside the pagination layer, so we need to subtract the visual
     // distance from the ancestor layer to the pagination layer.
-    LayoutPoint offsetFromPaginationLayerToAncestor;
-    ancestorLayer->convertToLayerCoords(paginationLayer, offsetFromPaginationLayerToAncestor);
-    offsetFromPaginationLayerToAncestor = flowThread->flowThreadPointToVisualPoint(offsetFromPaginationLayerToAncestor);
-    rect.moveBy(-offsetFromPaginationLayerToAncestor);
+    rect.moveBy(-ancestorLayer->visualOffsetFromAncestor(paginationLayer));
 }
 
 bool RenderLayer::useRegionBasedColumns() const
 {
     return renderer()->document().regionBasedColumnsEnabled();
 }
 
 void RenderLayer::updatePaginationRecursive(bool needsPaginationUpdate)
 {
     m_isPaginated = false;
@@ skipping 968 matching lines @@
         currLayer = accumulateOffsetTowardsAncestor(currLayer, ancestorLayer, location);
 }
 
 void RenderLayer::convertToLayerCoords(const RenderLayer* ancestorLayer, LayoutRect& rect) const
 {
     LayoutPoint delta;
     convertToLayerCoords(ancestorLayer, delta);
     rect.moveBy(delta);
 }
 
+LayoutPoint RenderLayer::visualOffsetFromAncestor(const RenderLayer* ancestorLayer) const
+{
+    RenderLayer* paginationLayer = enclosingPaginationLayer();
+    LayoutPoint offset;
+    if (!paginationLayer || paginationLayer == this) {
+        convertToLayerCoords(ancestorLayer, offset);
+        return offset;
+    }
+
+    RenderFlowThread* flowThread = toRenderFlowThread(paginationLayer->renderer());
+    convertToLayerCoords(paginationLayer, offset);
+    offset = flowThread->flowThreadPointToVisualPoint(offset);
+    if (ancestorLayer == paginationLayer)
+        return offset;
+
+    // FIXME: Handle nested fragmentation contexts (crbug.com/423076). For now just give up if there

[chrishtr, 2014/12/17 19:11:00]

Does this FIXME still apply now that there is recursion?

[mstensho (USE GERRIT), 2014/12/17 19:29:53]

Yes, we're still not quite there. I have prepared a CL for that as well, though.
Just need to land this one first.

+    // are different pagination layers involved.
+    if (!ancestorLayer->enclosingPaginationLayer() || ancestorLayer->enclosingPaginationLayer() != paginationLayer) {
+        // The easy case. The ancestor layer is not within the pagination layer.
+        return offset + paginationLayer->visualOffsetFromAncestor(ancestorLayer);
+    }
+    // The ancestor layer is also inside the pagination layer, so we need to subtract the visual
+    // distance from the ancestor layer to the pagination layer.
+    LayoutPoint offsetFromPaginationLayerToAncestor;

[chrishtr, 2014/12/17 19:11:00]

How about replacing 1477-1479 by:

offset.moveBy(-ancestorLayer->visualOffsetFromAncestor(paginationLayer)) ?

[mstensho (USE GERRIT), 2014/12/17 19:29:53]

Done.

+    ancestorLayer->convertToLayerCoords(paginationLayer, offsetFromPaginationLayerToAncestor);
+    offset.moveBy(-flowThread->flowThreadPointToVisualPoint(offsetFromPaginationLayerToAncestor));
+    return offset;
+}
+
 void RenderLayer::didUpdateNeedsCompositedScrolling()
 {
     updateSelfPaintingLayer();
 }
 
 void RenderLayer::updateReflectionInfo(const RenderStyle* oldStyle)
 {
     ASSERT(!oldStyle || !renderer()->style()->reflectionDataEquivalent(oldStyle));
     if (renderer()->hasReflection()) {
         if (!m_reflectionInfo)
@@ skipping 1408 matching lines @@
     }
 }
 
 void showLayerTree(const blink::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif