diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-08 18:50:49 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:42 -0800 |
| commit | 0cbc4f2c016ebe2b600784ac016f35c83b5f5b50 (patch) | |
| tree | 3787567d68331f8cac3c13b9ab67bc81740a0657 /WebCore/rendering/RenderFrame.cpp | |
| parent | 454b60990e7456af58a206f820de646101747595 (diff) | |
| download | external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.zip external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.tar.gz external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.tar.bz2 | |
Merge Webkit at r73109: render frame docWidth/docHeight method changed.
Change-Id: I492d321eea76f2d2c5278e44ae9c2fe37b5834a6
See:
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063
Diffstat (limited to 'WebCore/rendering/RenderFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index e7ad76a..a6d69e3 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())); + setHeight(max(root->docHeight(root->docTop()), height())); + setWidth(max(root->docWidth(docLeft), width())); } } setNeedsLayout(false); |