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

diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp
index a6d69e3..e7ad76a 100644 (file)
--- 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 (file)
--- 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)