Merge WebKit at r67908: ColumnInfo no longer provides columnRectAt()

See http://trac.webkit.org/changeset/67660

Change-Id: Ia3c17881d27919b20d62a47218cdb95293736b2e

2 files changed, 6 insertions, 5 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 8d9730f..399c253 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -783,7 +783,7 @@ CacheBuilder::CacheBuilder()
 }
 
 void CacheBuilder::adjustForColumns(const ClipColumnTracker& track, 
-    CachedNode* node, IntRect* bounds)
+    CachedNode* node, IntRect* bounds, RenderBlock* renderer)
 {
     int x = 0;
     int y = 0;
@@ -792,7 +792,7 @@ void CacheBuilder::adjustForColumns(const ClipColumnTracker& track,
     int columnGap = track.mColumnGap;
     size_t limit = track.mColumnInfo->columnCount();
     for (size_t index = 0; index < limit; index++) {
-        IntRect column = track.mColumnInfo->columnRectAt(index);
+        IntRect column = renderer->columnRectAt(track.mColumnInfo, index);
         column.move(tx, ty);
         IntRect test = *bounds;
         test.move(x, y);
@@ -1370,7 +1370,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
         while (--clipIndex > 0) {
             const ClipColumnTracker& clipTrack = clipTracker.at(clipIndex);
             if (clipTrack.mHasClip == false) {
-                adjustForColumns(clipTrack, &cachedNode, &absBounds);
+                adjustForColumns(clipTrack, &cachedNode, &absBounds, static_cast<RenderBlock*>(nodeRenderer));
                 continue;
             }
             const IntRect& parentClip = clipTrack.mBounds;
diff --git a/WebKit/android/nav/CacheBuilder.h b/WebKit/android/nav/CacheBuilder.h
index 5fcf560..cb61c9f 100644
--- a/WebKit/android/nav/CacheBuilder.h
+++ b/WebKit/android/nav/CacheBuilder.h
@@ -48,9 +48,10 @@ class InlineTextBox;
 class LayerAndroid;
 class Node;
 class PlatformGraphicsContext;
+class RenderBlock;
 class RenderFlow;
-class RenderObject;
 class RenderLayer;
+class RenderObject;
 class Text;
 
 }
@@ -210,7 +211,7 @@ private:
         bool mSomeParentTakesFocus;
     };
     void adjustForColumns(const ClipColumnTracker& track, 
-        CachedNode* node, IntRect* bounds);
+        CachedNode* node, IntRect* bounds, RenderBlock*);
     static bool AddPartRect(IntRect& bounds, int x, int y,
         WTF::Vector<IntRect>* result, IntRect* focusBounds);
     static bool AnyIsClick(Node* node);