diff options
| author | Steve Block <steveblock@google.com> | 2010-08-05 11:08:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-09 13:25:54 +0100 |
| commit | e04b4eaa324d69caf0cf14531a75814be6323b33 (patch) | |
| tree | 3828305ca15c2279ff6c0ffa9ce1e2fe7217320a /WebCore | |
| parent | c4daefab2bd7617afd2562dad5353da63d239428 (diff) | |
| download | external_webkit-e04b4eaa324d69caf0cf14531a75814be6323b33.zip external_webkit-e04b4eaa324d69caf0cf14531a75814be6323b33.tar.gz external_webkit-e04b4eaa324d69caf0cf14531a75814be6323b33.tar.bz2 | |
Merge WebKit at r64523 : Cherry-pick WebKit change 64732 for FILTERS guard
See http://trac.webkit.org/changeset/64732
Change-Id: I5fe2041764991c6c621bb634df1ed4bcb896f7eb
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/SVGResources.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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; |