merge mozilla-central mozilla-inbound. r=merge a=merge

dom/locales/en-US/chrome/dom/dom.properties

@@ -332,10 +332,10 @@ MozNoiseSuppressionWarning=mozNoiseSuppression is deprecated. Use noiseSuppressi
 XMLBaseAttributeWarning=Use of xml:base attribute is deprecated and will be removed soon. Please remove any use of it.
 # LOCALIZATION NOTE: Do not translate "content", "Window", and "window.top"
 WindowContentUntrustedWarning=The ‘content’ attribute of Window objects is deprecated.  Please use ‘window.top’ instead.
-# LOCALIZATION NOTE: The first %S is the tag name of the element that starts the loop, the second %S is the element's ID.
-SVGReferenceLoopWarning=The SVG <%S> with ID “%S” has a reference loop.
-# LOCALIZATION NOTE: The first %S is the tag name of the element in the chain where the chain was broken, the second %S is the element's ID.
-SVGReferenceChainLengthExceededWarning=An SVG <%S> reference chain which is too long was abandoned at the element with ID “%S”.
+# LOCALIZATION NOTE: %S is the tag name of the element that starts the loop
+SVGReferenceLoopWarning=There is an SVG <%S> reference loop in this document, which will prevent the document rendering correctly.
+# LOCALIZATION NOTE: %S is the tag name of the element that starts the chain
+SVGReferenceChainLengthExceededWarning=There is an SVG <%S> reference chain which is too long in this document, which will prevent the document rendering correctly.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceEmpty=‘%S’ attribute of <script> element is empty.
 # LOCALIZATION NOTE: Do not translate "<script>".

layout/svg/AutoReferenceChainGuard.h

@@ -151,11 +151,9 @@ public:
 
 private:
   void ReportErrorToConsole() {
-    nsAutoString tag, id;
-    dom::Element* element = mFrame->GetContent()->AsElement();
-    element->GetTagName(tag);
-    element->GetId(id);
-    const char16_t* params[] = { tag.get(), id.get() };
+    nsAutoString tag;
+    mFrame->GetContent()->AsElement()->GetTagName(tag);
+    const char16_t* params[] = { tag.get() };
     auto doc = mFrame->GetContent()->OwnerDoc();
     auto warning = *mFrameInUse ?
                      nsIDocument::eSVGReferenceLoop :