diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/rendering/RenderFrameBase.cpp | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/rendering/RenderFrameBase.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrameBase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderFrameBase.cpp b/WebCore/rendering/RenderFrameBase.cpp index 4a62f8a..b36ad3a 100644 --- a/WebCore/rendering/RenderFrameBase.cpp +++ b/WebCore/rendering/RenderFrameBase.cpp @@ -53,8 +53,8 @@ void RenderFrameBase::layoutWithFlattening(bool fixedWidth, bool fixedHeight) // need to update to calculate min/max correctly updateWidgetPosition(); - if (childRoot->prefWidthsDirty()) - childRoot->calcPrefWidths(); + if (childRoot->preferredLogicalWidthsDirty()) + childRoot->computePreferredLogicalWidths(); // if scrollbars are off, and the width or height are fixed // we obey them and do not expand. With frame flattening @@ -69,7 +69,7 @@ void RenderFrameBase::layoutWithFlattening(bool fixedWidth, bool fixedHeight) // make sure minimum preferred width is enforced if (isScrollable || !fixedWidth) { - setWidth(max(width(), childRoot->minPrefWidth() + hBorder)); + setWidth(max(width(), childRoot->minPreferredLogicalWidth() + hBorder)); // update again to pass the new width to the child frame updateWidgetPosition(); childFrameView->layout(); |