[wip] unprefix filter

third_party/WebKit/Source/core/layout/svg/SVGResources.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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/layout/svg/SVGResources.h"
 
 #include "core/SVGNames.h"
 #include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
 #include "core/layout/svg/LayoutSVGResourcePaintServer.h"
-#include "core/style/SVGComputedStyle.h"
+#include "core/style/ComputedStyle.h"
 #include "core/svg/SVGFilterElement.h"
 #include "core/svg/SVGGradientElement.h"
 #include "core/svg/SVGPatternElement.h"
 #include "core/svg/SVGURIReference.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
@@ skipping 157 matching lines @@
 }
 
 static inline SVGResources& ensureResources(OwnPtr<SVGResources>& resources)
 {
     if (!resources)
         resources = adoptPtr(new SVGResources);
 
     return *resources.get();
 }
 
-PassOwnPtr<SVGResources> SVGResources::buildResources(const LayoutObject* object, const SVGComputedStyle& style)
+PassOwnPtr<SVGResources> SVGResources::buildResources(const LayoutObject* object, const ComputedStyle& computedStyle)
 {
     ASSERT(object);
 
     Node* node = object->node();
     ASSERT(node);
     ASSERT_WITH_SECURITY_IMPLICATION(node->isSVGElement());
 
     SVGElement* element = toSVGElement(node);
     ASSERT(element);
 
     const AtomicString& tagName = element->localName();
     ASSERT(!tagName.isNull());
 
     TreeScope& treeScope = element->treeScope();
     SVGDocumentExtensions& extensions = element->document().accessSVGExtensions();
 
+    const SVGComputedStyle& style = computedStyle.svgStyle();
+
     OwnPtr<SVGResources> resources;
     if (clipperFilterMaskerTags().contains(tagName)) {
         if (style.hasClipper()) {
             AtomicString id = style.clipperResource();
             if (!ensureResources(resources).setClipper(getLayoutSVGResourceById<LayoutSVGResourceClipper>(treeScope, id)))
                 registerPendingResource(extensions, id, element);
         }
 
-        if (style.hasFilter()) {
-            AtomicString id = style.filterResource();
-            if (!ensureResources(resources).setFilter(getLayoutSVGResourceById<LayoutSVGResourceFilter>(treeScope, id)))
-                registerPendingResource(extensions, id, element);
+        if (computedStyle.hasFilter()) {

[fs, 2016/05/23 12:29:53]

I think LayoutSVGRoot should be left out of this - i.e not store a filter in
SVGResources. If it does it'll be sitting on two chairs - and inconsistently so
because this path is limited to only "url(#foo)". 

[Noel Gordon, 2016/05/29 04:15:28]

I stored the filter in SVGResources, and prevented FilterPainter from trying to
create / apply the filter.

+            const FilterOperations& filterOperations = computedStyle.filter();
+            if (filterOperations.size() == 1) {
+                const FilterOperation& filterOperation = *filterOperations.at(0);
+                if (filterOperation.type() == FilterOperation::REFERENCE) {
+                    const auto& referenceFilterOperation = toReferenceFilterOperation(filterOperation);
+                    AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), element->document());

[fs, 2016/05/23 12:29:53]

uNit: could use |treeScope| here (instead of element->document()) so that we're
consistently using one or the other (should matter here ATM I think.)

That being said though, ReferenceFilterOperation::url() is already resolved
against the base URL here, and the fragment is extracted (to
ReferenceFilterOperation::fragment()), so it seems the only thing needed here is
to use those (check if the URL is local and use the stored fragment if it is.)

[Noel Gordon, 2016/05/29 04:15:28]

Yes, done.
Didn't quite follow what you are asking for here.  The filter url(reference)
could be to another document, eg., url(other.svg#fragment) best I can tell.

[fs, 2016/05/30 11:58:52]

Yes, you still need to check that the reference is local ("check if the URL is
local"), so something like:

KURL url(ParsedURLString, referenceFilterOperation.url());
if (equalIgnoringFragmentIdentifier(url, document->url())
    id = AtomicString(referenceFilterOperation.fragment());

is what I had in mind. NVM though, I can fix that up later.

+                    if (!ensureResources(resources).setFilter(getLayoutSVGResourceById<LayoutSVGResourceFilter>(treeScope, id)))
+                        registerPendingResource(extensions, id, element);
+                }
+            }
         }
 
         if (style.hasMasker()) {
             AtomicString id = style.maskerResource();
             if (!ensureResources(resources).setMasker(getLayoutSVGResourceById<LayoutSVGResourceMasker>(treeScope, id)))
                 registerPendingResource(extensions, id, element);
         }
     }
 
     if (style.hasMarkers() && supportsMarkers(*element)) {
@@ skipping 419 matching lines @@
         if (LayoutSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
             fprintf(stderr, " |-> Stroke     : %p (node=%p)\n", stroke, stroke->element());
     }
 
     if (m_linkedResource)
         fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource, m_linkedResource->element());
 }
 #endif
 
 } // namespace blink