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/RenderReplica.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/RenderReplica.cpp')
| -rw-r--r-- | WebCore/rendering/RenderReplica.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderReplica.cpp b/WebCore/rendering/RenderReplica.cpp index 1d589ae..4b11f40 100644 --- a/WebCore/rendering/RenderReplica.cpp +++ b/WebCore/rendering/RenderReplica.cpp @@ -52,11 +52,11 @@ void RenderReplica::layout() setNeedsLayout(false); } -void RenderReplica::calcPrefWidths() +void RenderReplica::computePreferredLogicalWidths() { - m_minPrefWidth = parentBox()->width(); - m_maxPrefWidth = m_minPrefWidth; - setPrefWidthsDirty(false); + m_minPreferredLogicalWidth = parentBox()->width(); + m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth; + setPreferredLogicalWidthsDirty(false); } void RenderReplica::paint(PaintInfo& paintInfo, int tx, int ty) |