[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0c8b0223991e2c9b9705789d92a765f41425da20
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 14:12:22 2010 +0000

    2010-07-29  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed. Fix release builds, by removing unused variables, that only served for ASSERTs that are no longer needed.
    
            * rendering/SVGRenderSupport.cpp:
            (WebCore::SVGRenderSupport::prepareToRenderSVGContent):
            (WebCore::SVGRenderSupport::pointInClippingArea):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64277 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f6bc103..f067b8c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-07-29  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. Fix release builds, by removing unused variables, that only served for ASSERTs that are no longer needed.
+
+        * rendering/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderSupport::prepareToRenderSVGContent):
+        (WebCore::SVGRenderSupport::pointInClippingArea):
+
+2010-07-29  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Not reviewed. Fix build warning about unreachable code, seen on the windows slave.
 
         * rendering/RenderSVGContainer.cpp:
diff --git a/WebCore/rendering/SVGRenderSupport.cpp b/WebCore/rendering/SVGRenderSupport.cpp
index df4a936..34f6659 100644
--- a/WebCore/rendering/SVGRenderSupport.cpp
+++ b/WebCore/rendering/SVGRenderSupport.cpp
@@ -80,8 +80,6 @@ void SVGRenderSupport::mapLocalToContainer(const RenderObject* object, RenderBox
 bool SVGRenderSupport::prepareToRenderSVGContent(RenderObject* object, PaintInfo& paintInfo)
 {
     ASSERT(object);
-    SVGElement* svgElement = static_cast<SVGElement*>(object->node());
-    ASSERT(svgElement && svgElement->document() && svgElement->isStyled());
 
     RenderStyle* style = object->style();
     ASSERT(style);
@@ -310,12 +308,6 @@ bool SVGRenderSupport::pointInClippingArea(RenderObject* object, const FloatPoin
 {
     ASSERT(object);
 
-    RenderStyle* style = object->style();
-    ASSERT(style);
-
-    const SVGRenderStyle* svgStyle = style->svgStyle();
-    ASSERT(svgStyle);
-
     // We just take clippers into account to determine if a point is on the node. The Specification may
     // change later and we also need to check maskers.
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object);

-- 
WebKit Debian packaging