SVG objects with same idrefs conflict when under different shadow root

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

Index: third_party/WebKit/Source/core/svg/SVGElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGElement.cpp
index ca28a2c62aabbe6da3ad50231c4f87911506fcf2..8077bc91eefcb47b9707a6ce877c41c1eba241a2 100644
--- a/third_party/WebKit/Source/core/svg/SVGElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGElement.cpp
@@ -48,6 +48,7 @@
 #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"
@@ -87,6 +88,13 @@ void SVGElement::attachLayoutTree(const AttachContext& context) {
     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();
@@ -104,20 +112,20 @@ void SVGElement::willRecalcStyle(StyleRecalcChange change) {
 }
 
 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;
 
@@ -134,7 +142,7 @@ void SVGElement::buildPendingResourcesIfNeeded() {
       toSVGUseElement(clientElement)->invalidateShadowTree();
     else
       clientElement->buildPendingResource();
-    extensions.clearHasPendingResourcesIfPossible(clientElement);
+    treeScopeResources.clearHasPendingResourcesIfPossible(clientElement);
   }
 }