Merge webkit.org at R49305 : Update rendering to use new overflow methods.

See http://trac.webkit.org/changeset?new=47440

Change-Id: I140b6be130c1fb175c653f5ba2ba19fdc323bbc9

2 files changed, 8 insertions, 2 deletions

diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index 538225d..b2b14cd 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -970,7 +970,13 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i
                     setWidth(min(width(), maxWidth));
                     m_minPrefWidth = min(m_minPrefWidth, maxWidth);
                     m_maxPrefWidth = min(m_maxPrefWidth, maxWidth);
-                    m_overflowWidth = min(m_overflowWidth, maxWidth);
+
+                    IntRect overflow = layoutOverflowRect();
+                    if (overflow.width() > maxWidth) {
+                        overflow.setWidth(maxWidth);
+                        clearLayoutOverflow();
+                        addLayoutOverflow(overflow);
+                    }
                 }
             }
         }
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 0dc34c7..b7a650b 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1049,7 +1049,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             clip.mHasClip = hasClip;
             clip.mDirection = direction;
             if (columns != NULL) {
-                const IntRect& oRect = ((RenderBox*)nodeRenderer)->overflowRect(true);
+                const IntRect& oRect = ((RenderBox*)nodeRenderer)->visibleOverflowRect();
                 clip.mBounds.move(oRect.x(), oRect.y());
             }
         }