Merge 95301

Source/WebCore/rendering/svg/RenderSVGInlineText.h

 /*
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 31 matching lines @@
 
     float scalingFactor() const { return m_scalingFactor; }
     const Font& scaledFont() const { return m_scaledFont; }
     void updateScaledFont();
     static void computeNewScaledFontForStyle(RenderObject*, const RenderStyle*, float& scalingFactor, Font& scaledFont);
 
 private:
     virtual const char* renderName() const { return "RenderSVGInlineText"; }
 
     virtual void willBeDestroyed();
+    
+    virtual void setStyle(PassRefPtr<RenderStyle>);
     virtual void styleDidChange(StyleDifference, const RenderStyle*);
 
     // FIXME: We need objectBoundingBox for DRT results and filters at the moment.
     // This should be fixed to give back the objectBoundingBox of the text root.
     virtual FloatRect objectBoundingBox() const { return FloatRect(); }
 
     virtual bool requiresLayer() const { return false; }
     virtual bool isSVGInlineText() const { return true; }
 
     virtual VisiblePosition positionForPoint(const LayoutPoint&);
@@ skipping 18 matching lines @@
     return static_cast<const RenderSVGInlineText*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderSVGInlineText(const RenderSVGInlineText*);
 
 }
 
 #endif // ENABLE(SVG)
 #endif // RenderSVGInlineText_h