SVG objects with same idrefs conflict when under different shadow root

third_party/WebKit/Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann
  * <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 30 matching lines @@
 #include "core/events/Event.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/svg/LayoutSVGResourceContainer.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGElementRareData.h"
 #include "core/svg/SVGGraphicsElement.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/SVGTitleElement.h"
+#include "core/svg/SVGTreeScopeResources.h"
 #include "core/svg/SVGUseElement.h"
 #include "core/svg/properties/SVGProperty.h"
 #include "wtf/AutoReset.h"
 #include "wtf/Threading.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 using namespace SVGNames;
 
@@ skipping 19 matching lines @@
   if (SVGElement* element = correspondingElement())
     element->removeInstanceMapping(this);
 }
 
 void SVGElement::attachLayoutTree(const AttachContext& context) {
   Element::attachLayoutTree(context);
   if (SVGElement* element = correspondingElement())
     element->mapInstanceToElement(this);
 }
 
+TreeScope& SVGElement::treeScopeForIdResolution() const {
+  const SVGElement* treeScopeElement = this;
+  if (const SVGElement* element = correspondingElement())
+    treeScopeElement = element;
+  return treeScopeElement->treeScope();
+}
+
 int SVGElement::tabIndex() const {
   if (supportsFocus())
     return Element::tabIndex();
   return -1;
 }
 
 void SVGElement::willRecalcStyle(StyleRecalcChange change) {
   if (!hasSVGRareData())
     return;
   // If the style changes because of a regular property change (not induced by
   // SMIL animations themselves) reset the "computed style without SMIL style
   // properties", so the base value change gets reflected.
   if (change > NoChange || needsStyleRecalc())
     svgRareData()->setNeedsOverrideComputedStyleUpdate();
 }
 
 void SVGElement::buildPendingResourcesIfNeeded() {
-  Document& document = this->document();
   if (!needsPendingResourceHandling() || !isConnected() || inUseShadowTree())
     return;
 
-  SVGDocumentExtensions& extensions = document.accessSVGExtensions();
+  SVGTreeScopeResources& treeScopeResources =
+      treeScope().accessSVGTreeScopedResources();
   AtomicString resourceId = getIdAttribute();
-  if (!extensions.hasPendingResource(resourceId))
+  if (!treeScopeResources.hasPendingResource(resourceId))
     return;
   // Guaranteed by hasPendingResource.
   DCHECK(!resourceId.isEmpty());
 
   // Get pending elements for this id.
-  SVGDocumentExtensions::SVGPendingElements* pendingElements =
-      extensions.removePendingResource(resourceId);
+  SVGTreeScopeResources::SVGPendingElements* pendingElements =
+      treeScopeResources.removePendingResource(resourceId);
   if (!pendingElements || pendingElements->isEmpty())
     return;
 
   // Rebuild pending resources for each client of a pending resource that is
   // being removed.
   for (Element* clientElement : *pendingElements) {
     DCHECK(clientElement->hasPendingResources());
     if (!clientElement->hasPendingResources())
       continue;
     // TODO(fs): Ideally we'd always resolve pending resources async instead of
     // inside insertedInto and svgAttributeChanged. For now we only do it for
     // <use> since that would stamp out DOM.
     if (isSVGUseElement(clientElement))
       toSVGUseElement(clientElement)->invalidateShadowTree();
     else
       clientElement->buildPendingResource();
-    extensions.clearHasPendingResourcesIfPossible(clientElement);
+    treeScopeResources.clearHasPendingResourcesIfPossible(clientElement);
   }
 }
 
 SVGElementRareData* SVGElement::ensureSVGRareData() {
   if (hasSVGRareData())
     return svgRareData();
 
   m_SVGRareData = new SVGElementRareData(this);
   return m_SVGRareData.get();
 }
@@ skipping 1139 matching lines @@
   visitor->trace(m_className);
   Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName() {
   DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
   return evtString;
 }
 
 }  // namespace blink