Changeset 64732 in webkit

Timestamp:

Aug 5, 2010 4:19:48 AM (14 years ago)

Author:

steveblock@google.com

Message:

2010-08-05 Steve Block <​steveblock@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SVGResources.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Steve Block  <steveblock@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@google.com>
 

trunk/WebCore/rendering/SVGResources.cpp

@@ -142 +142 @@
     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();
@@ -373 +375 @@
         }
         break;
+    case FilterResourceType:
 #if ENABLE(FILTERS)
-    case FilterResourceType:
         if (!m_clipperFilterMaskerData)
             break;
@@ -381 +383 @@
             m_clipperFilterMaskerData->filter = 0;
         }
+#else
+        ASSERT_NOT_REACHED();
+#endif
         break;
-#endif
     case ClipperResourceType:
         if (!m_clipperFilterMaskerData)