diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-06 21:47:36 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:58:14 +0000 |
| commit | eb59725563a13f0488f1c45de966d482427b518b (patch) | |
| tree | 938332c0716c01850d27f6ec0077b2df58be6d27 /WebCore/rendering/RenderFrame.cpp | |
| parent | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (diff) | |
| download | external_webkit-eb59725563a13f0488f1c45de966d482427b518b.zip external_webkit-eb59725563a13f0488f1c45de966d482427b518b.tar.gz external_webkit-eb59725563a13f0488f1c45de966d482427b518b.tar.bz2 | |
Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changed
See http://trac.webkit.org/changeset/72852
Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a
Diffstat (limited to 'WebCore/rendering/RenderFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index e7ad76a..c3283f8 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); |