[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 1a97a8cab71854d0ec0d96b83638f09607ed2a29
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 14:08:52 2010 +0000

    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:
            (WebCore::RenderSVGContainer::selfWillPaint):
            * rendering/RenderSVGRoot.cpp:
            (WebCore::RenderSVGRoot::selfWillPaint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ed2ae4..f6bc103 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 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:
+        (WebCore::RenderSVGContainer::selfWillPaint):
+        * rendering/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::selfWillPaint):
+
+2010-07-29  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Reviewed by Dirk Schulze.
 
         WebKit shouldn't ignore resource cycles, but break them as Opera does
diff --git a/WebCore/rendering/RenderSVGContainer.cpp b/WebCore/rendering/RenderSVGContainer.cpp
index 5c737ef..bab07a4 100644
--- a/WebCore/rendering/RenderSVGContainer.cpp
+++ b/WebCore/rendering/RenderSVGContainer.cpp
@@ -72,8 +72,9 @@ bool RenderSVGContainer::selfWillPaint()
 #if ENABLE(FILTERS)
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(this);
     return resources && resources->filter();
-#endif
+#else
     return false;
+#endif
 }
 
 void RenderSVGContainer::paint(PaintInfo& paintInfo, int, int)
diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index 012a164..b66a870 100644
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -135,8 +135,9 @@ bool RenderSVGRoot::selfWillPaint()
 #if ENABLE(FILTERS)
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(this);
     return resources && resources->filter();
-#endif
+#else
     return false;
+#endif
 }
 
 void RenderSVGRoot::paint(PaintInfo& paintInfo, int parentX, int parentY)

-- 
WebKit Debian packaging