diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-03 11:43:11 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | d246a992a1b834d070d06055f701df55c176266d (patch) | |
| tree | 027ea990d93f3c1ad361ecb2ea602f30e1481a57 /WebCore | |
| parent | 6519a198e60c7ce0b9e38db00b3a1d1ef3338bd6 (diff) | |
| download | external_webkit-d246a992a1b834d070d06055f701df55c176266d.zip external_webkit-d246a992a1b834d070d06055f701df55c176266d.tar.gz external_webkit-d246a992a1b834d070d06055f701df55c176266d.tar.bz2 | |
Merge WebKit at r64264 : Compile fix: Filter guards in SVG
Introduced here: http://trac.webkit.org/changeset/64196/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Partially upstreamed as the file has changed upstream after the merge, and the newer version doesn't have both places where guards were needed.
Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=43338
Upstream CL: http://trac.webkit.org/changeset/64465/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Upstream change after merge where we have guards: http://trac.webkit.org/changeset/64440/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Change-Id: Iaab4595ded78485c81d6f61a726a5bd0f48c5621
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/SVGResourcesCycleSolver.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/rendering/SVGResourcesCycleSolver.cpp b/WebCore/rendering/SVGResourcesCycleSolver.cpp index 838758b..206efe5 100644 --- a/WebCore/rendering/SVGResourcesCycleSolver.cpp +++ b/WebCore/rendering/SVGResourcesCycleSolver.cpp @@ -101,8 +101,13 @@ static inline String targetReferenceFromResource(SVGElement* element, bool& isVa target = static_cast<SVGPatternElement*>(element)->href(); else if (element->hasTagName(SVGNames::linearGradientTag) || element->hasTagName(SVGNames::radialGradientTag)) target = static_cast<SVGGradientElement*>(element)->href(); +// ANDROID +// This is deleted upstream so we cannot upstream the guard +// http://trac.webkit.org/changeset/64440/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp +#if ENABLE(FILTERS) else if (element->hasTagName(SVGNames::filterTag)) target = static_cast<SVGFilterElement*>(element)->href(); +#endif else { isValid = false; return target; @@ -279,7 +284,9 @@ void SVGResourcesCycleSolver::breakCycle(RenderSVGResourceContainer* resourceLea break; case FilterResourceType: ASSERT(resourceLeadingToCycle == m_resources->filter()); +#if ENABLE(FILTERS) m_resources->resetFilter(); +#endif break; case ClipperResourceType: ASSERT(resourceLeadingToCycle == m_resources->clipper()); |