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.
- const int docLeft = root->docLeft();
- if (width() > root->docWidth(docLeft)) {
- view->resize(root->docWidth(docLeft), 0);
+ if (width() > root->docWidth()) {
+ view->resize(root->docWidth(), 0);
view->layout();
}
// Honor the height set by RenderFrameSet::positionFrames unless our document height is larger.
- setHeight(max(root->docHeight(root->docTop()), height()));
- setWidth(max(root->docWidth(docLeft), width()));
+ setHeight(max(root->docHeight(), height()));
+ setWidth(max(root->docWidth(), width()));
}
}
setNeedsLayout(false);
private:
bool shouldRepaint(const IntRect& r) const;
-<<<<<<< HEAD
#ifdef ANDROID_FLATTEN_FRAMESET
public: // used by layout function
#endif
- int docTop() const;
- int docHeight(int topOverflow) const;
- int docLeft() const;
- int docWidth(int leftOverflow) const;
-=======
int docHeight() const;
int docWidth() const;
->>>>>>> webkit.org at r72805
// These functions may only be accessed by LayoutStateMaintainer.
bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)