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

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

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGImageLoader.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, 2009 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008, 2009 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #ifndef SVGURIReference_h 21 #ifndef SVGURIReference_h
22 #define SVGURIReference_h 22 #define SVGURIReference_h
23 23
24 #include "core/dom/Document.h" 24 #include "core/dom/Document.h"
25 #include "core/dom/TreeScope.h"
25 26
26 namespace WebCore { 27 namespace WebCore {
27 28
28 class Attribute; 29 class Attribute;
29 class Element; 30 class Element;
30 31
31 class SVGURIReference { 32 class SVGURIReference {
32 public: 33 public:
33 virtual ~SVGURIReference() { } 34 virtual ~SVGURIReference() { }
34 35
35 bool parseAttribute(const QualifiedName&, const AtomicString&); 36 bool parseAttribute(const QualifiedName&, const AtomicString&);
36 bool isKnownAttribute(const QualifiedName&); 37 bool isKnownAttribute(const QualifiedName&);
37 void addSupportedAttributes(HashSet<QualifiedName>&); 38 void addSupportedAttributes(HashSet<QualifiedName>&);
38 39
39 static AtomicString fragmentIdentifierFromIRIString(const String&, const Doc ument&); 40 static AtomicString fragmentIdentifierFromIRIString(const String&, const Doc ument&);
40 static Element* targetElementFromIRIString(const String&, const Document&, A tomicString* = 0, Document* = 0); 41 static Element* targetElementFromIRIString(const String&, const Document&, A tomicString* = 0, Document* = 0);
41 42
42 static inline bool isExternalURIReference(const String& uri, const Document& document) 43 static inline bool isExternalURIReference(const String& uri, const TreeScope & treeScope)
43 { 44 {
44 // Fragment-only URIs are always internal 45 // Fragment-only URIs are always internal
45 if (uri.startsWith('#')) 46 if (uri.startsWith('#'))
46 return false; 47 return false;
47 48
48 // If the URI matches our documents URL, we're dealing with a local refe rence. 49 // If the URI matches our documents URL, we're dealing with a local refe rence.
49 KURL url = document.completeURL(uri); 50 KURL url = treeScope.completeURL(uri);
50 return !equalIgnoringFragmentIdentifier(url, document.url()); 51 return !equalIgnoringFragmentIdentifier(url, treeScope.document().url()) ;
51 } 52 }
52 53
53 protected: 54 protected:
54 virtual void setHrefBaseValue(const String&) = 0; 55 virtual void setHrefBaseValue(const String&) = 0;
55 }; 56 };
56 57
57 } // namespace WebCore 58 } // namespace WebCore
58 59
59 #endif // SVGURIReference_h 60 #endif // SVGURIReference_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGImageLoader.cpp ('k') | Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698