SVG objects with same idrefs conflict when under different shadow root

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

Index: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
index ca04994e55a7fc4f223d8d7ac6da85e2e6ed7c81..42c9c97d87b74a2e1a6920aee4b97e68c6b7608f 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -31,8 +31,8 @@
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
 #include "core/events/EventListener.h"
-#include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
+#include "core/svg/SVGTreeScopeResources.h"
 #include "core/svg/SVGURIReference.h"
 #include "core/svg/animation/SMILTimeContainer.h"
 #include "platform/heap/Handle.h"
@@ -208,12 +208,12 @@ void SVGSMILElement::buildPendingResource() {
 
   if (!svgTarget) {
     // Do not register as pending if we are already pending this resource.
-    if (document().accessSVGExtensions().isElementPendingResource(this, id))
+    if (treeScope().ensureSVGTreeScopedResources().isElementPendingResource(
+            this, id))
       return;
-
     if (!id.isEmpty()) {
-      document().accessSVGExtensions().addPendingResource(id, this);
-      ASSERT(hasPendingResources());
+      treeScope().ensureSVGTreeScopedResources().addPendingResource(id, this);
+      DCHECK(hasPendingResources());
     }
   } else {
     // Register us with the target in the dependencies map. Any change of
@@ -570,9 +570,11 @@ void SVGSMILElement::connectEventBaseConditions() {
       SVGElement* eventBase = eventBaseFor(*condition);
       if (!eventBase) {
         if (!condition->baseID().isEmpty() &&
-            !document().accessSVGExtensions().isElementPendingResource(
-                this, AtomicString(condition->baseID())))
-          document().accessSVGExtensions().addPendingResource(
+            !treeScope()
+                 .ensureSVGTreeScopedResources()
+                 .isElementPendingResource(this,
+                                           AtomicString(condition->baseID())))
+          treeScope().ensureSVGTreeScopedResources().addPendingResource(
               AtomicString(condition->baseID()), this);
         continue;
       }