diff options
Diffstat (limited to 'Source/WebCore/svg/SVGURIReference.cpp')
| -rw-r--r-- | Source/WebCore/svg/SVGURIReference.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/Source/WebCore/svg/SVGURIReference.cpp b/Source/WebCore/svg/SVGURIReference.cpp index a667e11d2..0e28196ba 100644 --- a/Source/WebCore/svg/SVGURIReference.cpp +++ b/Source/WebCore/svg/SVGURIReference.cpp @@ -19,11 +19,8 @@ */ #include "config.h" - -#if ENABLE(SVG) #include "SVGURIReference.h" -#include "Attribute.h" #include "Document.h" #include "Element.h" #include "URL.h" @@ -31,14 +28,10 @@ namespace WebCore { -bool SVGURIReference::parseAttribute(const QualifiedName& name, const AtomicString& value) +void SVGURIReference::parseAttribute(const QualifiedName& name, const AtomicString& value) { - if (name.matches(XLinkNames::hrefAttr)) { + if (name.matches(XLinkNames::hrefAttr)) setHrefBaseValue(value); - return true; - } - - return false; } bool SVGURIReference::isKnownAttribute(const QualifiedName& attrName) @@ -46,13 +39,13 @@ bool SVGURIReference::isKnownAttribute(const QualifiedName& attrName) return attrName.matches(XLinkNames::hrefAttr); } -String SVGURIReference::fragmentIdentifierFromIRIString(const String& url, Document& document) +String SVGURIReference::fragmentIdentifierFromIRIString(const String& url, const Document& document) { size_t start = url.find('#'); if (start == notFound) return emptyString(); - URL base = start ? URL(document.baseURI(), url.substring(0, start)) : document.baseURI(); + URL base = start ? URL(document.baseURL(), url.substring(0, start)) : document.baseURL(); String fragmentIdentifier = url.substring(start); URL kurl(base, fragmentIdentifier); if (equalIgnoringFragmentIdentifier(kurl, document.url())) @@ -62,7 +55,7 @@ String SVGURIReference::fragmentIdentifierFromIRIString(const String& url, Docum return emptyString(); } -static inline URL urlFromIRIStringWithFragmentIdentifier(const String& url, Document& document, String& fragmentIdentifier) +static inline URL urlFromIRIStringWithFragmentIdentifier(const String& url, const Document& document, String& fragmentIdentifier) { size_t startOfFragmentIdentifier = url.find('#'); if (startOfFragmentIdentifier == notFound) @@ -71,14 +64,14 @@ static inline URL urlFromIRIStringWithFragmentIdentifier(const String& url, Docu // Exclude the '#' character when determining the fragmentIdentifier. fragmentIdentifier = url.substring(startOfFragmentIdentifier + 1); if (startOfFragmentIdentifier) { - URL base(document.baseURI(), url.substring(0, startOfFragmentIdentifier)); + URL base(document.baseURL(), url.substring(0, startOfFragmentIdentifier)); return URL(base, url.substring(startOfFragmentIdentifier)); } - return URL(document.baseURI(), url.substring(startOfFragmentIdentifier)); + return URL(document.baseURL(), url.substring(startOfFragmentIdentifier)); } -Element* SVGURIReference::targetElementFromIRIString(const String& iri, Document& document, String* fragmentIdentifier, Document* externalDocument) +Element* SVGURIReference::targetElementFromIRIString(const String& iri, const Document& document, String* fragmentIdentifier, const Document* externalDocument) { // If there's no fragment identifier contained within the IRI string, we can't lookup an element. String id; @@ -111,5 +104,3 @@ void SVGURIReference::addSupportedAttributes(HashSet<QualifiedName>& supportedAt } } - -#endif // ENABLE(SVG) |