1 files changed, 8 insertions, 14 deletions

diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index 82b10d5..215aac7 100644
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -53,14 +53,8 @@ RenderSVGRoot::RenderSVGRoot(SVGStyledElement* node)
     setReplaced(true);
 }
 
-int RenderSVGRoot::lineHeight(bool, bool) const
+RenderSVGRoot::~RenderSVGRoot()
 {
-    return height() + marginTop() + marginBottom();
-}
-
-int RenderSVGRoot::baselinePosition(bool, bool) const
-{
-    return height() + marginTop() + marginBottom();
 }
 
 void RenderSVGRoot::computePreferredLogicalWidths()
@@ -68,7 +62,7 @@ void RenderSVGRoot::computePreferredLogicalWidths()
     ASSERT(preferredLogicalWidthsDirty());
 
     int borderAndPadding = borderAndPaddingWidth();
-    int width = computeReplacedWidth(false) + borderAndPadding;
+    int width = computeReplacedLogicalWidth(false) + borderAndPadding;
 
     if (style()->maxWidth().isFixed() && style()->maxWidth().value() != undefinedLength)
         width = min(width, style()->maxWidth().value() + (style()->boxSizing() == CONTENT_BOX ? borderAndPadding : 0));
@@ -82,10 +76,10 @@ void RenderSVGRoot::computePreferredLogicalWidths()
     setPreferredLogicalWidthsDirty(false);
 }
 
-int RenderSVGRoot::computeReplacedWidth(bool includeMaxWidth) const
+int RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) const
 {
-    int replacedWidth = RenderBox::computeReplacedWidth(includeMaxWidth);
-    if (!style()->width().isPercent())
+    int replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);
+    if (!style()->logicalWidth().isPercent())
         return replacedWidth;
 
     // FIXME: Investigate in size rounding issues
@@ -93,10 +87,10 @@ int RenderSVGRoot::computeReplacedWidth(bool includeMaxWidth) const
     return static_cast<int>(roundf(replacedWidth * svg->currentScale()));
 }
 
-int RenderSVGRoot::computeReplacedHeight() const
+int RenderSVGRoot::computeReplacedLogicalHeight() const
 {
-    int replacedHeight = RenderBox::computeReplacedHeight();
-    if (!style()->height().isPercent())
+    int replacedHeight = RenderBox::computeReplacedLogicalHeight();
+    if (!style()->logicalHeight().isPercent())
         return replacedHeight;
 
     // FIXME: Investigate in size rounding issues