Merge CSSSVGDocumentValue with CSSURIValue

third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp

Index: third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp b/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp
deleted file mode 100644
index 158620a17c881bcbaa7932236fb21637f0edb05b..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/core/css/CSSSVGDocumentValue.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "core/css/CSSSVGDocumentValue.h"
-
-#include "core/css/CSSMarkup.h"
-#include "core/dom/Document.h"
-#include "core/fetch/FetchInitiatorTypeNames.h"
-#include "core/fetch/FetchRequest.h"
-#include "core/fetch/ResourceFetcher.h"
-
-namespace blink {
-
-CSSSVGDocumentValue::CSSSVGDocumentValue(const String& url)
-    : CSSValue(CSSSVGDocumentClass)
-    , m_url(url)
-    , m_loadRequested(false)
-{
-}
-
-CSSSVGDocumentValue::~CSSSVGDocumentValue()
-{
-}
-
-DocumentResource* CSSSVGDocumentValue::load(Document* document) const
-{
-    ASSERT(document);
-
-    if (!m_loadRequested) {
-        m_loadRequested = true;
-
-        FetchRequest request(ResourceRequest(document->completeURL(m_url)), FetchInitiatorTypeNames::css);
-        m_document = DocumentResource::fetchSVGDocument(request, document->fetcher());
-    }
-
-    return m_document.get();
-}
-
-String CSSSVGDocumentValue::customCSSText() const
-{
-    return serializeString(m_url);

[Timothy Loh, 2016/07/21 04:01:45]

Probably you want to update consumeFilter and createFilterOperations to not wrap
this in an extra CSSFunctionValue

[fs, 2016/07/21 08:39:16]

Ouch, missed that detail... I guess it's either unwrap for url(...) in 'filter'
or wrap for the other cases. I'll try for the former, but I'd be interested to
hear if there's a preference one way or the other ("functions" are not
consistently represented as such.)

[fs, 2016/07/21 13:42:08]

Done. (Had to update FilterInterpolationFunctions too.)

-}
-
-bool CSSSVGDocumentValue::equals(const CSSSVGDocumentValue& other) const
-{
-    return m_url == other.m_url;
-}
-
-} // namespace blink