Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / ReferenceFilterBuilder.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/ReferenceFilterBuilder.cpp b/src/third_party/WebKit/Source/core/rendering/svg/ReferenceFilterBuilder.cpp
index e9c656c..4dca2dd 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/ReferenceFilterBuilder.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/svg/ReferenceFilterBuilder.cpp
@@ -34,16 +34,39 @@
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/dom/Element.h"
 #include "core/fetch/DocumentResource.h"
-#include "core/fetch/DocumentResourceReference.h"
-#include "core/platform/graphics/filters/FilterEffect.h"
-#include "core/platform/graphics/filters/SourceAlpha.h"
 #include "core/rendering/svg/RenderSVGResourceFilter.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
+#include "platform/graphics/filters/SourceAlpha.h"
 
 namespace WebCore {
 
+HashMap<const FilterOperation*, OwnPtr<DocumentResourceReference> >* ReferenceFilterBuilder::documentResourceReferences = 0;
+
+DocumentResourceReference* ReferenceFilterBuilder::documentResourceReference(const FilterOperation* filterOperation)
+{
+    if (!documentResourceReferences)
+        return 0;
+
+    return documentResourceReferences->get(filterOperation);
+}
+
+void ReferenceFilterBuilder::setDocumentResourceReference(const FilterOperation* filterOperation, PassOwnPtr<DocumentResourceReference> documentResourceReference)
+{
+    if (!documentResourceReferences)
+        documentResourceReferences = new HashMap<const FilterOperation*, OwnPtr<DocumentResourceReference> >;
+    documentResourceReferences->add(filterOperation, documentResourceReference);
+}
+
+void ReferenceFilterBuilder::clearDocumentResourceReference(const FilterOperation* filterOperation)
+{
+    if (!documentResourceReferences)
+        return;
+
+    documentResourceReferences->remove(filterOperation);
+}
+
 // Returns whether or not the SVGElement object contains a valid color-interpolation-filters attribute
 static bool getSVGElementColorSpace(SVGElement* svgElement, ColorSpace& cs)
 {
@@ -59,8 +82,7 @@ static bool getSVGElementColorSpace(SVGElement* svgElement, ColorSpace& cs)
         eColorInterpolation = svgStyle->colorInterpolationFilters();
     } else {
         // Otherwise, use the slow path by using string comparison (used by external svg files)
-        RefPtr<CSSValue> cssValue = svgElement->getPresentationAttribute(
-            SVGNames::color_interpolation_filtersAttr.toString());
+        RefPtr<CSSValue> cssValue = svgElement->getPresentationAttribute(AtomicString(SVGNames::color_interpolation_filtersAttr.toString()));
         if (cssValue.get() && cssValue->isPrimitiveValue()) {
             const CSSPrimitiveValue& primitiveValue = *((CSSPrimitiveValue*)cssValue.get());
             eColorInterpolation = (EColorInterpolation)primitiveValue;
@@ -91,13 +113,14 @@ PassRefPtr<FilterEffect> ReferenceFilterBuilder::build(Filter* parentFilter, Ren
 
     Document* document = &renderer->document();
 
-    DocumentResourceReference* documentResourceReference = filterOperation->documentResourceReference();
-    DocumentResource* cachedSVGDocument = documentResourceReference ? documentResourceReference->document() : 0;
+    if (DocumentResourceReference* documentResourceRef = documentResourceReference(filterOperation)) {
+        DocumentResource* cachedSVGDocument = documentResourceRef->document();
 
-    // If we have an SVG document, this is an external reference. Otherwise
-    // we look up the referenced node in the current document.
-    if (cachedSVGDocument)
-        document = cachedSVGDocument->document();
+        // If we have an SVG document, this is an external reference. Otherwise
+        // we look up the referenced node in the current document.
+        if (cachedSVGDocument)
+            document = cachedSVGDocument->document();
+    }
 
     if (!document)
         return 0;
@@ -145,7 +168,7 @@ PassRefPtr<FilterEffect> ReferenceFilterBuilder::build(Filter* parentFilter, Ren
         ColorSpace colorSpace = filterColorSpace;
         if (useFilterColorSpace || getSVGElementColorSpace(effectElement, colorSpace))
             effect->setOperatingColorSpace(colorSpace);
-        builder->add(effectElement->resultCurrentValue(), effect);
+        builder->add(AtomicString(effectElement->result()->currentValue()->value()), effect);
     }
     return builder->lastEffect();
 }