Merge CSSSVGDocumentValue with CSSURIValue

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * 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/ElementStyleResources.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSGradientValue.h"
 #include "core/css/CSSImageValue.h"
-#include "core/css/CSSSVGDocumentValue.h"
+#include "core/css/CSSURIValue.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/layout/svg/ReferenceFilterBuilder.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/ContentData.h"
 #include "core/style/CursorData.h"
 #include "core/style/FillLayer.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleFetchedImageSet.h"
 #include "core/style/StyleGeneratedImage.h"
@@ skipping 57 matching lines @@
 
 StyleImage* ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, const CSSCursorImageValue& value)
 {
     if (value.isCachePending(m_deviceScaleFactor)) {
         m_pendingImageProperties.add(property);
         return StylePendingImage::create(value);
     }
     return value.cachedImage(m_deviceScaleFactor);
 }
 
-void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, const CSSSVGDocumentValue* cssSVGDocumentValue)
+void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, const CSSURIValue* cssUriValue)
 {
-    m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue);
+    m_pendingSVGDocuments.set(filterOperation, cssUriValue);
 }
 
 void ElementStyleResources::loadPendingSVGDocuments(ComputedStyle* computedStyle)
 {
     if (!computedStyle->hasFilter() || m_pendingSVGDocuments.isEmpty())
         return;
 
     FilterOperations::FilterOperationVector& filterOperations = computedStyle->mutableFilter().operations();
     for (unsigned i = 0; i < filterOperations.size(); ++i) {
         FilterOperation* filterOperation = filterOperations.at(i);
         if (filterOperation->type() == FilterOperation::REFERENCE) {
             ReferenceFilterOperation* referenceFilter = toReferenceFilterOperation(filterOperation);
 
-            const CSSSVGDocumentValue* value = m_pendingSVGDocuments.get(referenceFilter);
+            const CSSURIValue* value = m_pendingSVGDocuments.get(referenceFilter);
             if (!value)
                 continue;
-            DocumentResource* resource = value->load(m_document);
+            DocumentResource* resource = value->load(*m_document);
             if (!resource)
                 continue;
 
             // Stash the DocumentResource on the reference filter.
             ReferenceFilterBuilder::setDocumentResourceReference(referenceFilter, new DocumentResourceReference(resource));
         }
     }
 }
 
 StyleImage* ElementStyleResources::loadPendingImage(ComputedStyle* style, StylePendingImage* pendingImage, CrossOriginAttributeValue crossOrigin)
@@ skipping 115 matching lines @@
     }
 }
 
 void ElementStyleResources::loadPendingResources(ComputedStyle* computedStyle)
 {
     loadPendingImages(computedStyle);
     loadPendingSVGDocuments(computedStyle);
 }
 
 } // namespace blink