Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: Source/core/svg/SVGURIReference.cpp

Issue 1127773003: This CL clean up patch in SVGElements. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/svg/SVGTextPositioningElement.cpp ('k') | Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 78
79 Element* SVGURIReference::targetElementFromIRIString(const String& iri, const Tr eeScope& treeScope, AtomicString* fragmentIdentifier, Document* externalDocument ) 79 Element* SVGURIReference::targetElementFromIRIString(const String& iri, const Tr eeScope& treeScope, AtomicString* fragmentIdentifier, Document* externalDocument )
80 { 80 {
81 const Document& document = treeScope.document(); 81 const Document& document = treeScope.document();
82 82
83 // If there's no fragment identifier contained within the IRI string, we can 't lookup an element. 83 // If there's no fragment identifier contained within the IRI string, we can 't lookup an element.
84 AtomicString id; 84 AtomicString id;
85 KURL url = urlFromIRIStringWithFragmentIdentifier(iri, document, id); 85 KURL url = urlFromIRIStringWithFragmentIdentifier(iri, document, id);
86 if (url == KURL()) 86 if (url == KURL())
87 return 0; 87 return nullptr;
88 88
89 if (fragmentIdentifier) 89 if (fragmentIdentifier)
90 *fragmentIdentifier = id; 90 *fragmentIdentifier = id;
91 91
92 if (id.isEmpty()) 92 if (id.isEmpty())
93 return 0; 93 return nullptr;
94 94
95 if (externalDocument) { 95 if (externalDocument) {
96 // Enforce that the referenced url matches the url of the document that we've loaded for it! 96 // Enforce that the referenced url matches the url of the document that we've loaded for it!
97 ASSERT(equalIgnoringFragmentIdentifier(url, externalDocument->url())); 97 ASSERT(equalIgnoringFragmentIdentifier(url, externalDocument->url()));
98 return externalDocument->getElementById(id); 98 return externalDocument->getElementById(id);
99 } 99 }
100 100
101 // Exit early if the referenced url is external, and we have no externalDocu ment given. 101 // Exit early if the referenced url is external, and we have no externalDocu ment given.
102 if (isExternalURIReference(iri, document)) 102 if (isExternalURIReference(iri, document))
103 return 0; 103 return nullptr;
104 104
105 return treeScope.getElementById(id); 105 return treeScope.getElementById(id);
106 } 106 }
107 107
108 void SVGURIReference::addSupportedAttributes(HashSet<QualifiedName>& supportedAt tributes) 108 void SVGURIReference::addSupportedAttributes(HashSet<QualifiedName>& supportedAt tributes)
109 { 109 {
110 supportedAttributes.add(XLinkNames::hrefAttr); 110 supportedAttributes.add(XLinkNames::hrefAttr);
111 } 111 }
112 112
113 } 113 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGTextPositioningElement.cpp ('k') | Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698