diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/rendering/InlineBox.cpp | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/rendering/InlineBox.cpp')
| -rw-r--r-- | WebCore/rendering/InlineBox.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/WebCore/rendering/InlineBox.cpp b/WebCore/rendering/InlineBox.cpp index bbf11b3..2575fb7 100644 --- a/WebCore/rendering/InlineBox.cpp +++ b/WebCore/rendering/InlineBox.cpp @@ -98,18 +98,11 @@ int InlineBox::height() const return toRenderBox(m_renderer)->height(); ASSERT(isInlineFlowBox()); - const InlineFlowBox* flowBox = static_cast<const InlineFlowBox*>(this); RenderBoxModelObject* flowObject = boxModelObject(); const Font& font = renderer()->style(m_firstLine)->font(); int result = font.height(); - bool strictMode = renderer()->document()->inStrictMode(); if (parent()) result += flowObject->borderTop() + flowObject->paddingTop() + flowObject->borderBottom() + flowObject->paddingBottom(); - if (strictMode || flowBox->hasTextChildren() || flowObject->hasHorizontalBordersOrPadding()) - return result; - int bottom = root()->bottomOverflow(); - if (y() + result > bottom) - result = bottom - y(); return result; } |