diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/rendering/RenderApplet.cpp | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/rendering/RenderApplet.cpp')
| -rw-r--r-- | WebCore/rendering/RenderApplet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderApplet.cpp b/WebCore/rendering/RenderApplet.cpp index 062641e..7411c54 100644 --- a/WebCore/rendering/RenderApplet.cpp +++ b/WebCore/rendering/RenderApplet.cpp @@ -59,9 +59,9 @@ void RenderApplet::createWidgetIfNecessary() // use fixed widths/heights from the style system when we can, since the widget might // not have an accurate m_width/m_height. int contentWidth = style()->width().isFixed() ? style()->width().value() : - width() - borderLeft() - borderRight() - paddingLeft() - paddingRight(); + width() - borderAndPaddingWidth(); int contentHeight = style()->height().isFixed() ? style()->height().value() : - height() - borderTop() - borderBottom() - paddingTop() - paddingBottom(); + height() - borderAndPaddingHeight(); for (Node* child = element->firstChild(); child; child = child->nextSibling()) { if (child->hasTagName(paramTag)) { HTMLParamElement* p = static_cast<HTMLParamElement*>(child); |