From 115fa20e56568607490319cf8075fca19ae9112c Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Mar 2011 12:47:30 +0000 Subject: Fix scrolling on sites hosting content inside a single Force a layout of the frameview when we detect that a frames content post flattening is wider than the original frame. Also force a relayout of the frame as necessary to sync the correct dimensions (i.e. when navigation occurs inside the frame) Bug:4051085 Change-Id: Ib2543601a71b6931bb3ec4bfda75a2cac26bb2a1 --- WebCore/rendering/RenderFrame.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'WebCore/rendering/RenderFrame.cpp') diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index bc40976..a773fbc 100644 --- a/WebCore/rendering/RenderFrame.cpp +++ b/WebCore/rendering/RenderFrame.cpp @@ -80,10 +80,9 @@ void RenderFrame::layout() setWidth(max(view->contentsWidth() + borderAndPaddingWidth(), width())); setHeight(max(view->contentsHeight() + borderAndPaddingHeight(), height())); - // This should trigger a layout of the FrameView which will schedule a - // relayout of this RenderFrame. + // Trigger a layout of the FrameView which will schedule a relayout of this RenderFrame. if (layoutWidth < width()) - setHeight(0); + view->layout(); setNeedsLayout(false); } -- cgit v1.1