From 21939df44de1705786c545cd1bf519d47250322d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 May 2010 18:35:50 +0100
Subject: Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
---
 WebCore/rendering/RenderApplet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/rendering/RenderApplet.cpp')

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);
-- 
cgit v1.1