diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 21:51:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 11:03:34 +0100 |
| commit | 15196e7281a07cd210bad6e50ad31dabab648e6c (patch) | |
| tree | 5004c33ef7ff1e9350f21a90037c8ed0b53d1be0 /WebCore/rendering/RenderIFrame.cpp | |
| parent | 8f53f0666f20844fa87c63e5f823470c12fc2721 (diff) | |
| download | external_webkit-15196e7281a07cd210bad6e50ad31dabab648e6c.zip external_webkit-15196e7281a07cd210bad6e50ad31dabab648e6c.tar.gz external_webkit-15196e7281a07cd210bad6e50ad31dabab648e6c.tar.bz2 | |
Merge WebKit at r68651 : Renamed variables
Changed m_minPrefWidth and m_maxPrefWidth to m_minPreferredLogicalWidth
and m_maxPreferredLogicalWidth in this CL:
http://trac.webkit.org/changeset/68276/trunk/WebCore/rendering/RenderBox.h
This changed containerWidth to containerLogicalWidth
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
Also changed calcReplacedWidthUsing to computeReplacedWidthUsing here:
http://trac.webkit.org/changeset/68239/trunk/WebCore/rendering/RenderBox.h
Change-Id: I8eb912128aa5e09f55f4495671209cb8ca2ba3f0
Diffstat (limited to 'WebCore/rendering/RenderIFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderIFrame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderIFrame.cpp b/WebCore/rendering/RenderIFrame.cpp index 4ed8077..a2cf66c 100644 --- a/WebCore/rendering/RenderIFrame.cpp +++ b/WebCore/rendering/RenderIFrame.cpp @@ -103,7 +103,7 @@ void RenderIFrame::computeLogicalWidth() int extraWidth = paddingLeft() + paddingRight() + borderLeft() + borderRight(); // Set the width - setWidth(max(width(), root->minPrefWidth()) + extraWidth); + setWidth(max(width(), root->minPreferredLogicalWidth()) + extraWidth); // Update based on the new width updateWidgetPosition(); @@ -194,7 +194,7 @@ void RenderIFrame::layout() // Use the preferred width if it is larger and only if // scrollbars are visible or the width style is not fixed. if (scrolling || !widthIsFixed) - setWidth(max(width(), root->minPrefWidth()) + extraWidth); + setWidth(max(width(), root->minPreferredLogicalWidth()) + extraWidth); // Resize the view to recalc the height. int h = height() - extraHeight; |