Bug 1510785 - Only build XBL related code when MOZ_XBL is defined. r=bzbarsky

When XBL is disabled, no code in dom/xbl will be built. Also, adds ifdefs
to remove any of the XBL related code elsewhere. There's definitely more
that can be done here, but I think it's better to wait to do the rest of
the cleanup when we actually remove the code.

Depends on D45612

Differential Revision: https://phabricator.services.mozilla.com/D45613

--HG--
extra : moz-landing-system : lando

Author: Brendan Dahl

accessible/base/AccIterator.cpp

@@ -264,12 +264,16 @@ dom::Element* IDRefsIterator::GetElem(nsIContent* aContent,
         aContent->GetUncomposedDocOrConnectedShadowRoot();
     if (docOrShadowRoot) {
       dom::Element* refElm = docOrShadowRoot->GetElementById(aID);
-      if (refElm || !aContent->GetXBLBinding()) {
+      if (refElm
+#ifdef MOZ_XBL
+          || !aContent->GetXBLBinding()
+#endif
+      )
         return refElm;
-      }
     }
   }
 
+#ifdef MOZ_XBL
   // If content is in anonymous subtree or an element having anonymous subtree
   // then use "anonid" attribute to get elements in anonymous subtree.
 
@@ -288,6 +292,7 @@ dom::Element* IDRefsIterator::GetElem(nsIContent* aContent,
     return aContent->OwnerDoc()->GetAnonymousElementByAttribute(
         aContent, nsGkAtoms::anonid, aID);
   }
+#endif
 
   return nullptr;
 }

accessible/base/moz.build

@@ -82,7 +82,6 @@ LOCAL_INCLUDES += [
     '/accessible/xpcom',
     '/accessible/xul',
     '/dom/base',
-    '/dom/xbl',
     '/ipc/chromium/src',
     '/layout/generic',
     '/layout/style',
@@ -91,6 +90,9 @@ LOCAL_INCLUDES += [
     '/layout/xul/tree/',
 ]
 
+if CONFIG['MOZ_XBL']:
+    LOCAL_INCLUDES += ['/dom/xbl']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
     LOCAL_INCLUDES += [
         '/accessible/atk',

accessible/base/nsAccessibilityService.cpp

@@ -65,8 +65,6 @@
 #include "nsTreeBodyFrame.h"
 #include "nsTreeColumns.h"
 #include "nsTreeUtils.h"
-#include "nsXBLPrototypeBinding.h"
-#include "nsXBLBinding.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/DOMStringList.h"
 #include "mozilla/dom/EventTarget.h"

dom/base/BindContext.h

@@ -9,7 +9,9 @@
 #ifndef mozilla_dom_BindContext_h__
 #define mozilla_dom_BindContext_h__
 
-#include "nsXBLBinding.h"
+#ifdef MOZ_XBL
+#  include "nsXBLBinding.h"
+#endif
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/dom/Document.h"
@@ -97,6 +99,7 @@ struct MOZ_STACK_CLASS BindContext final {
     MOZ_ASSERT(mInComposedDoc, "Binding NAC in a disconnected subtree?");
   }
 
+#ifdef MOZ_XBL
   // This is meant to be used to bind XBL anonymous content.
   BindContext(nsXBLBinding& aBinding, Element& aParentElement)
       : mDoc(*aParentElement.OwnerDoc()),
@@ -107,6 +110,7 @@ struct MOZ_STACK_CLASS BindContext final {
         mCollectingDisplayedNodeDataDuringLoad(
             ShouldCollectDisplayedNodeDataDuringLoad(mInComposedDoc, mDoc,
                                                      aParentElement)) {}
+#endif
 
   bool CollectingDisplayedNodeDataDuringLoad() const {
     return mCollectingDisplayedNodeDataDuringLoad;

dom/base/CharacterData.cpp

@@ -29,7 +29,9 @@
 #include "nsCOMArray.h"
 #include "nsNodeUtils.h"
 #include "mozilla/dom/DirectionalityUtils.h"
-#include "nsBindingManager.h"
+#ifdef MOZ_XBL
+#  include "nsBindingManager.h"
+#endif
 #include "nsCCUncollectableMarker.h"
 #include "mozAutoDocUpdate.h"
 #include "nsTextNode.h"
@@ -513,7 +515,9 @@ void CharacterData::UnbindFromTree(bool aNullParent) {
 
   HandleShadowDOMRelatedRemovalSteps(aNullParent);
 
+#ifdef MOZ_XBL
   Document* document = GetComposedDoc();
+#endif
 
   if (aNullParent) {
     if (IsRootOfNativeAnonymousSubtree()) {
@@ -536,6 +540,7 @@ void CharacterData::UnbindFromTree(bool aNullParent) {
     SetSubtreeRootPointer(aNullParent ? this : mParent->SubtreeRoot());
   }
 
+#ifdef MOZ_XBL
   if (document && !GetContainingShadow()) {
     // Notify XBL- & nsIAnonymousContentCreator-generated
     // anonymous content that the document is changing.
@@ -546,6 +551,7 @@ void CharacterData::UnbindFromTree(bool aNullParent) {
           document->BindingManager(), this, document));
     }
   }
+#endif
 
   nsExtendedContentSlots* slots = GetExistingExtendedContentSlots();
   if (slots) {

dom/base/CharacterData.h

@@ -169,7 +169,9 @@ class CharacterData : public nsIContent {
   void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const override {}
 #endif
 
+#ifdef MOZ_XBL
   nsXBLBinding* DoGetXBLBinding() const final { return nullptr; }
+#endif
 
   bool IsNodeOfType(uint32_t aFlags) const override { return false; }
 

dom/base/ChildIterator.cpp

@@ -8,7 +8,9 @@
 #include "nsContentUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLSlotElement.h"
-#include "mozilla/dom/XBLChildrenElement.h"
+#ifdef MOZ_XBL
+#  include "mozilla/dom/XBLChildrenElement.h"
+#endif
 #include "mozilla/dom/ShadowRoot.h"
 #include "nsIAnonymousContentCreator.h"
 #include "nsIFrame.h"
@@ -46,13 +48,17 @@ nsIContent* ExplicitChildIterator::GetNextChild() {
       return mChild;
     }
 
+#ifdef MOZ_XBL
     MOZ_ASSERT(mChild->IsActiveChildrenElement());
     auto* childrenElement = static_cast<XBLChildrenElement*>(mChild);
     if (mIndexInInserted < childrenElement->InsertedChildrenLength()) {
       return childrenElement->InsertedChild(mIndexInInserted++);
     }
     mIndexInInserted = 0;
     mChild = mChild->GetNextSibling();
+#else
+    MOZ_ASSERT_UNREACHABLE("This needs to be revisited");
+#endif
   } else if (mDefaultChild) {
     // If we're already in default content, check if there are more nodes there
     MOZ_ASSERT(mChild);
@@ -88,6 +94,7 @@ nsIContent* ExplicitChildIterator::GetNextChild() {
   // content.
   while (mChild) {
     if (mChild->IsActiveChildrenElement()) {
+#ifdef MOZ_XBL
       // If the current child being iterated is a content insertion point
       // then the iterator needs to return the nodes distributed into
       // the content insertion point.
@@ -108,6 +115,9 @@ nsIContent* ExplicitChildIterator::GetNextChild() {
       // If we have an insertion point with no assigned nodes and
       // no default content, move on to the next node.
       mChild = mChild->GetNextSibling();
+#else
+      MOZ_ASSERT_UNREACHABLE("This needs to be revisited");
+#endif
     } else {
       // mChild is not an insertion point, thus it is the next node to
       // return from this iterator.
@@ -134,6 +144,7 @@ void FlattenedChildIterator::Init(bool aIgnoreXBL) {
     }
   }
 
+#ifdef MOZ_XBL
   nsXBLBinding* binding =
       mParent->OwnerDoc()->BindingManager()->GetBindingWithContent(mParent);
 
@@ -142,6 +153,7 @@ void FlattenedChildIterator::Init(bool aIgnoreXBL) {
     mParent = binding->GetAnonymousContent();
     mXBLInvolved = Some(true);
   }
+#endif
 }
 
 bool FlattenedChildIterator::ComputeWhetherXBLIsInvolved() const {
@@ -199,9 +211,13 @@ nsIContent* ExplicitChildIterator::Get() const {
   }
 
   if (mIndexInInserted) {
+#ifdef MOZ_XBL
     MOZ_ASSERT(mChild->IsActiveChildrenElement());
     auto* childrenElement = static_cast<XBLChildrenElement*>(mChild);
     return childrenElement->InsertedChild(mIndexInInserted - 1);
+#else
+    MOZ_ASSERT_UNREACHABLE("This needs to be revisited");
+#endif
   }
 
   return mDefaultChild ? mDefaultChild : mChild;
@@ -224,6 +240,7 @@ nsIContent* ExplicitChildIterator::GetPreviousChild() {
       return mChild;
     }
 
+#ifdef MOZ_XBL
     // NB: mIndexInInserted points one past the last returned child so we need
     // to look *two* indices back in order to return the previous child.
     MOZ_ASSERT(mChild->IsActiveChildrenElement());
@@ -232,6 +249,9 @@ nsIContent* ExplicitChildIterator::GetPreviousChild() {
       return childrenElement->InsertedChild(mIndexInInserted - 1);
     }
     mChild = mChild->GetPreviousSibling();
+#else
+    MOZ_ASSERT_UNREACHABLE("This needs to be revisited");
+#endif
   } else if (mDefaultChild) {
     // If we're already in default content, check if there are more nodes there
     mDefaultChild = mDefaultChild->GetPreviousSibling();
@@ -264,6 +284,7 @@ nsIContent* ExplicitChildIterator::GetPreviousChild() {
   // content.
   while (mChild) {
     if (mChild->IsActiveChildrenElement()) {
+#ifdef MOZ_XBL
       // If the current child being iterated is a content insertion point
       // then the iterator needs to return the nodes distributed into
       // the content insertion point.
@@ -279,6 +300,9 @@ nsIContent* ExplicitChildIterator::GetPreviousChild() {
       }
 
       mChild = mChild->GetPreviousSibling();
+#else
+      MOZ_ASSERT_UNREACHABLE("This needs to be revisited");
+#endif
     } else {
       // mChild is not an insertion point, thus it is the next node to
       // return from this iterator.