Simplify URL-resolving in targetElementFromIRIString

third_party/WebKit/Source/core/svg/SVGURIReference.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  *
  * 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,
@@ skipping 38 matching lines @@
     if (element.hasAttribute(SVGNames::hrefAttr))
         return element.getAttribute(SVGNames::hrefAttr);
     return element.getAttribute(XLinkNames::hrefAttr);
 }
 
 KURL SVGURIReference::legacyHrefURL(const Document& document) const
 {
     return document.completeURL(stripLeadingAndTrailingHTMLSpaces(hrefString()));
 }
 
-AtomicString SVGURIReference::fragmentIdentifierFromIRIString(const String& url, const TreeScope& treeScope)
-{
-    size_t start = url.find('#');
-    if (start == kNotFound)
-        return emptyAtom;
-
-    const Document& document = treeScope.document();
-    KURL base = start ? KURL(document.baseURI(), url.substring(0, start)) : document.baseURI();
-    if (equalIgnoringFragmentIdentifier(base, document.url()))
-        return AtomicString(url.substring(start + 1));
-
-    return emptyAtom;
-}
-
-static inline KURL urlFromIRIStringWithFragmentIdentifier(const String& url, const TreeScope& treeScope, AtomicString& fragmentIdentifier)
-{
-    size_t startOfFragmentIdentifier = url.find('#');
-    if (startOfFragmentIdentifier == kNotFound)
-        return KURL();
-
-    const Document& document = treeScope.document();
-
-    // Exclude the '#' character when determining the fragmentIdentifier.
-    fragmentIdentifier = AtomicString(url.substring(startOfFragmentIdentifier + 1));
-    if (startOfFragmentIdentifier) {
-        KURL base(document.baseURI(), url.substring(0, startOfFragmentIdentifier));
-        return KURL(base, url.substring(startOfFragmentIdentifier));
-    }
-
-    return KURL(document.baseURI(), url.substring(startOfFragmentIdentifier));
-}
-
-Element* SVGURIReference::targetElementFromIRIString(const String& iri, const TreeScope& treeScope, AtomicString* fragmentIdentifier, Document* externalDocument)
+AtomicString SVGURIReference::fragmentIdentifierFromIRIString(const String& urlString, const TreeScope& treeScope)
 {
     const Document& document = treeScope.document();
 
-    // If there's no fragment identifier contained within the IRI string, we can't lookup an element.
-    AtomicString id;
-    KURL url = urlFromIRIStringWithFragmentIdentifier(iri, document, id);
-    if (url == KURL())
+    KURL url = document.completeURL(urlString);
+    if (!url.hasFragmentIdentifier() || !equalIgnoringFragmentIdentifier(url, document.url()))
+        return emptyAtom;
+    return AtomicString(url.fragmentIdentifier());
+}
+
+Element* SVGURIReference::targetElementFromIRIString(const String& urlString, const TreeScope& treeScope, AtomicString* fragmentIdentifier, Document* externalDocument)
+{
+    const Document& document = treeScope.document();
+
+    KURL url = document.completeURL(urlString);
+    if (!url.hasFragmentIdentifier())
         return nullptr;
 
+    AtomicString id(url.fragmentIdentifier());
     if (fragmentIdentifier)
         *fragmentIdentifier = id;
 
-    if (id.isEmpty())
-        return nullptr;
-
     if (externalDocument) {
         // Enforce that the referenced url matches the url of the document that we've loaded for it!
         ASSERT(equalIgnoringFragmentIdentifier(url, externalDocument->url()));
         return externalDocument->getElementById(id);

[Stephen Chennney, 2016/07/20 15:33:21]

Does this return nullptr for an empty id? Otherwise you've lost the check for
empty id.

     }
 
     // Exit early if the referenced url is external, and we have no externalDocument given.
-    if (isExternalURIReference(iri, document))
+    if (!equalIgnoringFragmentIdentifier(url, document.url()))
         return nullptr;
 
     return treeScope.getElementById(id);

[Stephen Chennney, 2016/07/20 15:33:21]

Ditto.

 }
 
 } // namespace blink