1 files changed, 6 insertions, 6 deletions

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 63ce830..da6fad1 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -471,7 +471,7 @@ TransformationMatrix RenderLayer::renderableTransform(PaintBehavior paintBehavio
 void RenderLayer::updatePagination()
 {
     m_isPaginated = false;
-    if (isComposited() || !parent() || renderer()->isPositioned())
+    if (isComposited() || !parent())
         return; // FIXME: We will have to deal with paginated compositing layers someday.
                 // FIXME: For now the RenderView can't be paginated.  Eventually printing will move to a model where it is though.
     
@@ -2588,11 +2588,11 @@ void RenderLayer::paintChildLayerIntoColumns(RenderLayer* childLayer, RenderLaye
     columnBlock->layer()->convertToLayerCoords(rootLayer, layerX, layerY);
     
     ColumnInfo* colInfo = columnBlock->columnInfo();
-    unsigned colCount = colInfo->columnCount();
+    unsigned colCount = columnBlock->columnCount(colInfo);
     int currYOffset = 0;
     for (unsigned i = 0; i < colCount; i++) {
         // For each rect, we clip to the rect, and then we adjust our coords.
-        IntRect colRect = colInfo->columnRectAt(i);
+        IntRect colRect = columnBlock->columnRectAt(colInfo, i);
         int currXOffset = colRect.x() - (columnBlock->borderLeft() + columnBlock->paddingLeft());
         colRect.move(layerX, layerY);
 
@@ -3054,17 +3054,17 @@ RenderLayer* RenderLayer::hitTestChildLayerColumns(RenderLayer* childLayer, Rend
     columnBlock->layer()->convertToLayerCoords(rootLayer, layerX, layerY);
     
     ColumnInfo* colInfo = columnBlock->columnInfo();
-    int colCount = colInfo->columnCount();
+    int colCount = columnBlock->columnCount(colInfo);
     
     // We have to go backwards from the last column to the first.
     int left = columnBlock->borderLeft() + columnBlock->paddingLeft();
     int currYOffset = 0;
     int i;
     for (i = 0; i < colCount; i++)
-        currYOffset -= colInfo->columnRectAt(i).height();
+        currYOffset -= columnBlock->columnRectAt(colInfo, i).height();
     for (i = colCount - 1; i >= 0; i--) {
         // For each rect, we clip to the rect, and then we adjust our coords.
-        IntRect colRect = colInfo->columnRectAt(i);
+        IntRect colRect = columnBlock->columnRectAt(colInfo, i);
         int currXOffset = colRect.x() - left;
         currYOffset += colRect.height();
         colRect.move(layerX, layerY);