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

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

Issue 2107153002: SVG object with same idrefs get conflicted even they are under different shadow root Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename the method in TreeScope class Created 4 years, 5 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
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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 AtomicString id; 321 AtomicString id;
322 Element* target = targetElementFromIRIString(hrefString(), treeScope(), &id, externalDocument); 322 Element* target = targetElementFromIRIString(hrefString(), treeScope(), &id, externalDocument);
323 if (!target || !target->inShadowIncludingDocument()) { 323 if (!target || !target->inShadowIncludingDocument()) {
324 // If we can't find the target of an external element, just give up. 324 // If we can't find the target of an external element, just give up.
325 // We can't observe if the target somewhen enters the external document, nor should we do it. 325 // We can't observe if the target somewhen enters the external document, nor should we do it.
326 if (externalDocument) 326 if (externalDocument)
327 return; 327 return;
328 if (id.isEmpty()) 328 if (id.isEmpty())
329 return; 329 return;
330 330
331 document().accessSVGExtensions().addPendingResource(id, this); 331 treeScope().accessSVGTreeScopedResources().addPendingResource(id, this);
332 ASSERT(hasPendingResources()); 332 ASSERT(hasPendingResources());
333 return; 333 return;
334 } 334 }
335 335
336 if (target->isSVGElement()) { 336 if (target->isSVGElement()) {
337 buildShadowAndInstanceTree(toSVGElement(*target)); 337 buildShadowAndInstanceTree(toSVGElement(*target));
338 invalidateDependentShadowTrees(); 338 invalidateDependentShadowTrees();
339 } 339 }
340 340
341 ASSERT(!m_needsShadowTreeRecreation); 341 ASSERT(!m_needsShadowTreeRecreation);
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 749
750 if (m_resource) 750 if (m_resource)
751 m_resource->removeClient(this); 751 m_resource->removeClient(this);
752 752
753 m_resource = resource; 753 m_resource = resource;
754 if (m_resource) 754 if (m_resource)
755 m_resource->addClient(this); 755 m_resource->addClient(this);
756 } 756 }
757 757
758 } // namespace blink 758 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698