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

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit 001cf70481f0f1091e785e8526b13f6e39ab3afa
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 11:19:48 2010 +0000

    2010-08-05  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            targetReferenceFromResource() in SVGResources.cpp is missing an ENABLE(FILTERS) guard
            https://bugs.webkit.org/show_bug.cgi?id=43550
    
            Also updates an existing ENABLE(FILTERS) guard to avoid a compiler
            warning 'case FilterResourceType not handled in switch' when FILTERS
            is not enabled.
    
            No new tests, build fix only.
    
            * rendering/SVGResources.cpp:
            (WebCore::targetReferenceFromResource):
            (WebCore::SVGResources::resourceDestroyed):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e2627e7..403e16f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-05  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        targetReferenceFromResource() in SVGResources.cpp is missing an ENABLE(FILTERS) guard
+        https://bugs.webkit.org/show_bug.cgi?id=43550
+
+        Also updates an existing ENABLE(FILTERS) guard to avoid a compiler
+        warning 'case FilterResourceType not handled in switch' when FILTERS
+        is not enabled.
+
+        No new tests, build fix only.
+
+        * rendering/SVGResources.cpp:
+        (WebCore::targetReferenceFromResource):
+        (WebCore::SVGResources::resourceDestroyed):
+
 2010-08-05  Victoria Kirst  <vrk at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/rendering/SVGResources.cpp b/WebCore/rendering/SVGResources.cpp
index fa1677b..290ef41 100644
--- a/WebCore/rendering/SVGResources.cpp
+++ b/WebCore/rendering/SVGResources.cpp
@@ -141,8 +141,10 @@ static inline String targetReferenceFromResource(SVGElement* element)
         target = static_cast<SVGPatternElement*>(element)->href();
     else if (element->hasTagName(SVGNames::linearGradientTag) || element->hasTagName(SVGNames::radialGradientTag))
         target = static_cast<SVGGradientElement*>(element)->href();
+#if ENABLE(FILTERS)
     else if (element->hasTagName(SVGNames::filterTag))
         target = static_cast<SVGFilterElement*>(element)->href();
+#endif
     else
         ASSERT_NOT_REACHED();
 
@@ -372,16 +374,18 @@ void SVGResources::resourceDestroyed(RenderSVGResourceContainer* resource)
             m_fillStrokeData->stroke = 0;
         }
         break;
-#if ENABLE(FILTERS)
     case FilterResourceType:
+#if ENABLE(FILTERS)
         if (!m_clipperFilterMaskerData)
             break;
         if (m_clipperFilterMaskerData->filter == resource) {
             m_clipperFilterMaskerData->filter->invalidateClients();
             m_clipperFilterMaskerData->filter = 0;
         }
-        break;
+#else
+        ASSERT_NOT_REACHED();
 #endif
+        break;
     case ClipperResourceType:
         if (!m_clipperFilterMaskerData)
             break; 

-- 
WebKit Debian packaging