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

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

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/SVGURIReference.h ('k') | no next file » | 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, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
5 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 5 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
6 * Copyright (C) 2012 University of Szeged 6 * Copyright (C) 2012 University of Szeged
7 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org> 7 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 || attrName == SVGNames::heightAttr) { 216 || attrName == SVGNames::heightAttr) {
217 updateRelativeLengthsInformation(); 217 updateRelativeLengthsInformation();
218 if (renderer) 218 if (renderer)
219 RenderSVGResource::markForLayoutAndParentResourceInvalidation(render er); 219 RenderSVGResource::markForLayoutAndParentResourceInvalidation(render er);
220 return; 220 return;
221 } 221 }
222 222
223 if (SVGURIReference::isKnownAttribute(attrName)) { 223 if (SVGURIReference::isKnownAttribute(attrName)) {
224 bool isExternalReference = isExternalURIReference(hrefCurrentValue(), do cument()); 224 bool isExternalReference = isExternalURIReference(hrefCurrentValue(), do cument());
225 if (isExternalReference) { 225 if (isExternalReference) {
226 KURL url = document().completeURL(hrefCurrentValue()); 226 KURL url = treeScope().completeURL(hrefCurrentValue());
227 if (url.hasFragmentIdentifier()) { 227 if (url.hasFragmentIdentifier()) {
228 FetchRequest request(ResourceRequest(url.string()), localName()) ; 228 FetchRequest request(ResourceRequest(url.string()), localName()) ;
229 setDocumentResource(document().fetcher()->fetchSVGDocument(reque st)); 229 setDocumentResource(document().fetcher()->fetchSVGDocument(reque st));
230 } 230 }
231 } else { 231 } else {
232 setDocumentResource(0); 232 setDocumentResource(0);
233 } 233 }
234 234
235 if (!m_wasInsertedByParser) 235 if (!m_wasInsertedByParser)
236 buildPendingResource(); 236 buildPendingResource();
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 983
984 if (m_resource) 984 if (m_resource)
985 m_resource->removeClient(this); 985 m_resource->removeClient(this);
986 986
987 m_resource = resource; 987 m_resource = resource;
988 if (m_resource) 988 if (m_resource)
989 m_resource->addClient(this); 989 m_resource->addClient(this);
990 } 990 }
991 991
992 } 992 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGURIReference.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698