Merge CSSSVGDocumentValue with CSSURIValue

third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 13 matching lines @@
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/css/resolver/FilterOperationResolver.h"
 
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSShadowValue.h"
+#include "core/css/CSSURIValue.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/frame/UseCounter.h"
 #include "core/layout/svg/ReferenceFilterBuilder.h"
 
 namespace blink {
 
 FilterOperation::OperationType FilterOperationResolver::filterOperationForType(CSSValueID type)
 {
     switch (type) {
-    case CSSValueUrl:
-        return FilterOperation::REFERENCE;
     case CSSValueGrayscale:
         return FilterOperation::GRAYSCALE;
     case CSSValueSepia:
         return FilterOperation::SEPIA;
     case CSSValueSaturate:
         return FilterOperation::SATURATE;
     case CSSValueHueRotate:
         return FilterOperation::HUE_ROTATE;
     case CSSValueInvert:
         return FilterOperation::INVERT;
@@ skipping 65 matching lines @@
 {
     FilterOperations operations;
 
     if (inValue.isPrimitiveValue()) {
         ASSERT(toCSSPrimitiveValue(inValue).getValueID() == CSSValueNone);
         return operations;
     }
 
     const CSSToLengthConversionData& conversionData = state.cssToLengthConversionData();
     for (auto& currValue : toCSSValueList(inValue)) {
-        const CSSFunctionValue* filterValue = toCSSFunctionValue(currValue.get());
-        FilterOperation::OperationType operationType = filterOperationForType(filterValue->functionType());
-        countFilterUse(operationType, state.document());
-        ASSERT(filterValue->length() <= 1);
+        if (currValue->isURIValue()) {
+            countFilterUse(FilterOperation::REFERENCE, state.document());
 
-        if (operationType == FilterOperation::REFERENCE) {
-            const CSSSVGDocumentValue& svgDocumentValue = toCSSSVGDocumentValue(filterValue->item(0));
-            KURL url = state.document().completeURL(svgDocumentValue.url());
+            const CSSURIValue& urlValue = toCSSURIValue(*currValue);
+            KURL url = state.document().completeURL(urlValue.url());
 
-            ReferenceFilterOperation* operation = ReferenceFilterOperation::create(svgDocumentValue.url(), AtomicString(url.fragmentIdentifier()));
+            ReferenceFilterOperation* operation = ReferenceFilterOperation::create(urlValue.url(), AtomicString(url.fragmentIdentifier()));
             if (!equalIgnoringFragmentIdentifier(url, state.document().url())) {
-                if (!svgDocumentValue.loadRequested())
-                    state.elementStyleResources().addPendingSVGDocument(operation, &svgDocumentValue);
-                else if (svgDocumentValue.cachedSVGDocument())
-                    ReferenceFilterBuilder::setDocumentResourceReference(operation, new DocumentResourceReference(svgDocumentValue.cachedSVGDocument()));
+                if (!urlValue.loadRequested())
+                    state.elementStyleResources().addPendingSVGDocument(operation, &urlValue);
+                else if (urlValue.cachedDocument())
+                    ReferenceFilterBuilder::setDocumentResourceReference(operation, new DocumentResourceReference(urlValue.cachedDocument()));
             }
             operations.operations().append(operation);
             continue;
         }
 
+        const CSSFunctionValue* filterValue = toCSSFunctionValue(currValue.get());
+        FilterOperation::OperationType operationType = filterOperationForType(filterValue->functionType());
+        countFilterUse(operationType, state.document());
+        DCHECK_LE(filterValue->length(), 1u);
+
         const CSSPrimitiveValue* firstValue = filterValue->length() && filterValue->item(0).isPrimitiveValue() ? &toCSSPrimitiveValue(filterValue->item(0)) : nullptr;
         switch (filterValue->functionType()) {
         case CSSValueGrayscale:
         case CSSValueSepia:
         case CSSValueSaturate: {
             double amount = 1;
             if (filterValue->length() == 1) {
                 amount = firstValue->getDoubleValue();
                 if (firstValue->isPercentage())
                     amount /= 100;
@@ skipping 45 matching lines @@
         default:
             ASSERT_NOT_REACHED();
             break;
         }
     }
 
     return operations;
 }
 
 } // namespace blink