From: Ben Murdoch <benm@google.com>
Date: Thu, 6 Jan 2011 21:47:36 +0000 (+0000)
Subject: Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb59725563a13f0488f1c45de966d482427b518b;p=android-x86%2Fexternal-webkit.git

Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed

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

Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a
---

diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp
index e7ad76a5f..c3283f808 100644
--- a/WebCore/rendering/RenderFrame.cpp
+++ b/WebCore/rendering/RenderFrame.cpp
@@ -81,13 +81,14 @@ void RenderFrame::layout()
             view->layout();
             // We can only grow in width and height because if positionFrames gives us a width and we become smaller,
             // then the fixup process of forcing the frame to fill extra space will fail.
-            if (width() > root->docWidth()) {
-                view->resize(root->docWidth(), 0);
+            const int docLeft = root->docLeft();
+            if (width() > root->docWidth(docLeft)) {
+                view->resize(root->docWidth(docLeft), 0);
                 view->layout();
             }
             // Honor the height set by RenderFrameSet::positionFrames unless our document height is larger.
             setHeight(max(root->docHeight(), height()));
-            setWidth(max(root->docWidth(), width()));
+            setWidth(max(root->docWidth(docLeft), width()));
         }
     }
     setNeedsLayout(false);