diff options
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 9 | ||||
| -rw-r--r-- | WebCore/rendering/RenderView.h | 6 |
2 files changed, 5 insertions, 10 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); diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 99b6a5e..27abf36 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -175,20 +175,14 @@ protected: private: bool shouldRepaint(const IntRect& r) const; -<<<<<<< HEAD #ifdef ANDROID_FLATTEN_FRAMESET public: // used by layout function #endif - int docHeight() const; - int docWidth() const; -======= - int docTop() const; int docHeight(int topOverflow) const; int docLeft() const; int docWidth(int leftOverflow) const; ->>>>>>> webkit.org at r73109 // These functions may only be accessed by LayoutStateMaintainer. bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |