Bug 833012 - Remove "nsContentUtils.h" inclusion from Element.h. r=Ms2ger

2024-09-13 09:24:08 -07:00 · 2013-01-31 23:11:49 +00:00 · 2013-01-31 23:11:49 +00:00 · 9ad0959156
commit 9ad0959156
parent 9f6e4099c4
36 changed files with 54 additions and 11 deletions
--- a/content/base/public/Element.h
+++ b/content/base/public/Element.h
@ -47,6 +47,7 @@
 #include "nsEvent.h"
 #include "nsAttrValue.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "nsIHTMLCollection.h"

 class nsIDOMEventListener;
 class nsIFrame;
@ -62,7 +63,6 @@ class nsAttrValueOrString;
 class ContentUnbinder;
 class nsClientRect;
 class nsClientRectList;
-class nsIHTMLCollection;
 class nsContentList;
 class nsDOMTokenList;
 struct nsRect;
@ -447,16 +447,7 @@ public:
                              nsIAtom* aPrefix,
                              const nsAttrValueOrString& aValue,
                              bool aNotify, nsAttrValue& aOldValue,
-                              uint8_t* aModType, bool* aHasListeners)
-  {
-    if (MaybeCheckSameAttrVal(aNamespaceID, aName, aPrefix, aValue, aNotify,
-                              aOldValue, aModType, aHasListeners)) {
-      nsAutoScriptBlocker scriptBlocker;
-      nsNodeUtils::AttributeSetToCurrentValue(this, aNamespaceID, aName);
-      return true;
-    }
-    return false;
-  }
+                              uint8_t* aModType, bool* aHasListeners);

  virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix,
                           const nsAString& aValue, bool aNotify);
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@ -1728,6 +1728,23 @@ Element::MaybeCheckSameAttrVal(int32_t aNamespaceID,
  return false;
 }

+bool
+Element::OnlyNotifySameValueSet(int32_t aNamespaceID, nsIAtom* aName,
+                                nsIAtom* aPrefix,
+                                const nsAttrValueOrString& aValue,
+                                bool aNotify, nsAttrValue& aOldValue,
+                                uint8_t* aModType, bool* aHasListeners)
+{
+  if (!MaybeCheckSameAttrVal(aNamespaceID, aName, aPrefix, aValue, aNotify,
+                             aOldValue, aModType, aHasListeners)) {
+    return false;
+  }
+
+  nsAutoScriptBlocker scriptBlocker;
+  nsNodeUtils::AttributeSetToCurrentValue(this, aNamespaceID, aName);
+  return true;
+}
+
 nsresult
 Element::SetAttr(int32_t aNamespaceID, nsIAtom* aName,
                 nsIAtom* aPrefix, const nsAString& aValue,
--- a/content/base/src/nsFormData.cpp
+++ b/content/base/src/nsFormData.cpp
@ -9,6 +9,7 @@
 #include "nsHTMLFormElement.h"
 #include "mozilla/dom/FormDataBinding.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/canvas/src/WebGLBuffer.cpp
+++ b/content/canvas/src/WebGLBuffer.cpp
@ -6,6 +6,7 @@
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLExtensionBase.cpp
+++ b/content/canvas/src/WebGLExtensionBase.cpp
@ -5,6 +5,7 @@

 #include "WebGLContext.h"
 #include "WebGLExtensions.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLFramebuffer.cpp
+++ b/content/canvas/src/WebGLFramebuffer.cpp
@ -6,6 +6,7 @@
 #include "WebGLContext.h"
 #include "WebGLFramebuffer.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLProgram.cpp
+++ b/content/canvas/src/WebGLProgram.cpp
@ -6,6 +6,7 @@
 #include "WebGLContext.h"
 #include "WebGLProgram.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLRenderbuffer.cpp
+++ b/content/canvas/src/WebGLRenderbuffer.cpp
@ -6,6 +6,7 @@
 #include "WebGLContext.h"
 #include "WebGLRenderbuffer.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLShader.cpp
+++ b/content/canvas/src/WebGLShader.cpp
@ -6,6 +6,7 @@
 #include "WebGLShader.h"
 #include "WebGLContext.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/canvas/src/WebGLTexture.cpp
+++ b/content/canvas/src/WebGLTexture.cpp
@ -7,6 +7,7 @@
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include <algorithm>
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/html/content/src/HTMLFontElement.cpp
+++ b/content/html/content/src/HTMLFontElement.cpp
@ -10,6 +10,7 @@
 #include "nsAttrValueInlines.h"
 #include "nsMappedAttributes.h"
 #include "nsRuleData.h"
+#include "nsContentUtils.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(Font)
 DOMCI_NODE_DATA(HTMLFontElement, mozilla::dom::HTMLFontElement)
--- a/content/html/content/src/HTMLObjectElement.cpp
+++ b/content/html/content/src/HTMLObjectElement.cpp
@ -23,6 +23,7 @@
 #include "nsNPAPIPluginInstance.h"
 #include "nsIConstraintValidation.h"
 #include "nsIWidget.h"
+#include "nsContentUtils.h"

 namespace mozilla {
 namespace dom {
--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@ -13,6 +13,7 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/HTMLCollectionBinding.h"
 #include "mozilla/dom/HTMLTableElementBinding.h"
+#include "nsContentUtils.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(Table)
 DOMCI_NODE_DATA(HTMLTableElement, mozilla::dom::HTMLTableElement)
--- a/content/html/content/src/HTMLTableRowElement.cpp
+++ b/content/html/content/src/HTMLTableRowElement.cpp
@ -12,6 +12,8 @@
 #include "nsRuleData.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/HTMLTableRowElementBinding.h"
+#include "nsContentList.h"
+#include "nsContentUtils.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(TableRow)
 DOMCI_NODE_DATA(HTMLTableRowElement, mozilla::dom::HTMLTableRowElement)
--- a/content/html/content/src/HTMLTableRowElement.h
+++ b/content/html/content/src/HTMLTableRowElement.h
@ -10,6 +10,7 @@

 class nsIDOMHTMLTableElement;
 class nsIDOMHTMLTableSectionElement;
+class nsContentList;

 namespace mozilla {
 namespace dom {
--- a/content/html/content/src/HTMLTableSectionElement.cpp
+++ b/content/html/content/src/HTMLTableSectionElement.cpp
@ -11,6 +11,7 @@
 #include "nsRuleData.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/HTMLTableSectionElementBinding.h"
+#include "nsContentUtils.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(TableSection)
 DOMCI_NODE_DATA(HTMLTableSectionElement, mozilla::dom::HTMLTableSectionElement)
--- a/content/html/content/src/HTMLTableSectionElement.h
+++ b/content/html/content/src/HTMLTableSectionElement.h
@ -7,6 +7,7 @@

 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLTableSectionElement.h"
+#include "nsContentList.h" // For ctor.

 namespace mozilla {
 namespace dom {
--- a/content/html/content/src/nsHTMLSharedObjectElement.cpp
+++ b/content/html/content/src/nsHTMLSharedObjectElement.cpp
@ -20,6 +20,7 @@
 #include "nsIDOMSVGDocument.h"
 #include "nsIScriptError.h"
 #include "nsIWidget.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/smil/nsSMILAnimationController.cpp
+++ b/content/smil/nsSMILAnimationController.cpp
@ -14,6 +14,7 @@
 #include "nsIDOMSVGAnimationElement.h"
 #include "nsSMILTimedElement.h"
 #include <algorithm>
+#include "mozilla/AutoRestore.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/DOMSVGAnimatedLengthList.cpp
+++ b/content/svg/content/src/DOMSVGAnimatedLengthList.cpp
@ -10,6 +10,7 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedLengthListBinding.h"
+#include "nsContentUtils.h"

 // See the architecture comment in this file's header.

--- a/content/svg/content/src/DOMSVGAnimatedNumberList.cpp
+++ b/content/svg/content/src/DOMSVGAnimatedNumberList.cpp
@ -10,6 +10,7 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedNumberListBinding.h"
+#include "nsContentUtils.h"

 // See the architecture comment in this file's header.

--- a/content/svg/content/src/DOMSVGAnimatedTransformList.cpp
+++ b/content/svg/content/src/DOMSVGAnimatedTransformList.cpp
@ -8,6 +8,7 @@
 #include "SVGAnimatedTransformList.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedTransformListBinding.h"
+#include "nsContentUtils.h"

 namespace mozilla {

--- a/content/svg/content/src/SVGAngle.cpp
+++ b/content/svg/content/src/SVGAngle.cpp
@ -6,6 +6,7 @@
 #include "SVGAngle.h"
 #include "nsSVGAngle.h"
 #include "mozilla/dom/SVGAngleBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/SVGAnimatedAngle.cpp
+++ b/content/svg/content/src/SVGAnimatedAngle.cpp
@ -7,6 +7,7 @@
 #include "SVGAngle.h"
 #include "nsSVGAngle.h"
 #include "mozilla/dom/SVGAnimatedAngleBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/SVGAnimatedBoolean.cpp
+++ b/content/svg/content/src/SVGAnimatedBoolean.cpp
@ -6,6 +6,7 @@
 #include "SVGAnimatedBoolean.h"
 #include "nsSVGBoolean.h"
 #include "mozilla/dom/SVGAnimatedBooleanBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/SVGAnimatedLength.cpp
+++ b/content/svg/content/src/SVGAnimatedLength.cpp
@ -5,6 +5,7 @@

 #include "mozilla/dom/SVGAnimatedLength.h"
 #include "mozilla/dom/SVGAnimatedLengthBinding.h"
+#include "nsContentUtils.h"

 DOMCI_DATA(SVGAnimatedLength, mozilla::dom::SVGAnimatedLength)

--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
@ -12,6 +12,7 @@
 #include "SMILEnumType.h"
 #include "nsAttrValueInlines.h"
 #include "mozilla/dom/SVGAnimatedPreserveAspectRatioBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/SVGContentUtils.cpp
+++ b/content/svg/content/src/SVGContentUtils.cpp
@ -18,6 +18,7 @@
 #include "SVGAnimationElement.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/svg/content/src/SVGFragmentIdentifier.cpp
+++ b/content/svg/content/src/SVGFragmentIdentifier.cpp
@ -8,6 +8,7 @@
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGViewElement.h"
 #include "SVGAnimatedTransformList.h"
+#include "nsContentUtils.h"

 using namespace mozilla;

--- a/content/svg/content/src/SVGImageElement.cpp
+++ b/content/svg/content/src/SVGImageElement.cpp
@ -14,6 +14,7 @@
 #include "imgINotificationObserver.h"
 #include "gfxContext.h"
 #include "mozilla/dom/SVGImageElementBinding.h"
+#include "nsContentUtils.h"

 DOMCI_NODE_DATA(SVGImageElement, mozilla::dom::SVGImageElement)

--- a/content/svg/content/src/SVGPreserveAspectRatio.cpp
+++ b/content/svg/content/src/SVGPreserveAspectRatio.cpp
@ -6,6 +6,7 @@
 #include "SVGPreserveAspectRatio.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "mozilla/dom/SVGPreserveAspectRatioBinding.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace dom;
--- a/content/svg/content/src/SVGTSpanElement.cpp
+++ b/content/svg/content/src/SVGTSpanElement.cpp
@ -5,6 +5,7 @@

 #include "mozilla/dom/SVGTSpanElement.h"
 #include "mozilla/dom/SVGTSpanElementBinding.h"
+#include "nsContentUtils.h"

 DOMCI_NODE_DATA(SVGTSpanElement, mozilla::dom::SVGTSpanElement)

--- a/content/svg/content/src/nsSVGFilters.cpp
+++ b/content/svg/content/src/nsSVGFilters.cpp
@ -37,6 +37,7 @@
 #include "gfxUtils.h"
 #include "SVGContentUtils.h"
 #include <algorithm>
+#include "nsContentUtils.h"

 #if defined(XP_WIN) 
 // Prevent Windows redefining LoadImage
--- a/layout/svg/nsSVGFilterFrame.cpp
+++ b/layout/svg/nsSVGFilterFrame.cpp
@ -18,6 +18,7 @@
 #include "nsSVGFilterPaintCallback.h"
 #include "nsSVGIntegrationUtils.h"
 #include "nsSVGUtils.h"
+#include "nsContentUtils.h"

 nsIFrame*
 NS_NewSVGFilterFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
--- a/layout/svg/nsSVGImageFrame.cpp
+++ b/layout/svg/nsSVGImageFrame.cpp
@ -18,6 +18,7 @@
 #include "nsSVGUtils.h"
 #include "SVGContentUtils.h"
 #include "mozilla/dom/SVGImageElement.h"
+#include "nsContentUtils.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@ -32,6 +32,7 @@
 #include "base/thread.h"
 #include "prenv.h"
 #include "mozilla/Attributes.h"
+#include "nsContentUtils.h"

 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"