diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:20:13 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:22:59 +0000 |
| commit | 85d7b260f352d69c53a1274f445dca6fbe33bf4c (patch) | |
| tree | 57f2f8e030caca8270af889de1a23d118983ed38 | |
| parent | 554cfd3a98768455a2914724d6f79f4e91b38f41 (diff) | |
| download | external_webkit-85d7b260f352d69c53a1274f445dca6fbe33bf4c.zip external_webkit-85d7b260f352d69c53a1274f445dca6fbe33bf4c.tar.gz external_webkit-85d7b260f352d69c53a1274f445dca6fbe33bf4c.tar.bz2 | |
Merge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight()
This is effectively a revert of
"Merge Webkit at r73109: render frame docWidth/docHeight method changed."
See http://trac.webkit.org/changeset/72852 and
http://trac.webkit.org/changeset/73063
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I81915808439847dce87beefdd527f77962e074b5
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 9 | ||||
| -rw-r--r-- | WebCore/rendering/RenderView.h | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index a6d69e3..e7ad76a 100644 --- a/WebCore/rendering/RenderFrame.cpp +++ b/WebCore/rendering/RenderFrame.cpp @@ -81,14 +81,13 @@ 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. - 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); diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index a139e51..81cb686 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -176,18 +176,11 @@ protected: 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) |