Bug 1410895: Multiple cleanups on top. r=bz

MozReview-Commit-ID: GX3dfmWL083

--HG--
extra : rebase_source : 5ed1b625356d7f561559747fae30f2342459538a

dom/base/FragmentOrElement.cpp

@@ -206,7 +206,7 @@ nsIContent::GetFlattenedTreeParentNodeInternal(FlattenedParentType aType) const
     }
   }
 
-  if (parent && nsContentUtils::HasDistributedChildren(parent) &&
+  if (nsContentUtils::HasDistributedChildren(parent) &&
       nsContentUtils::IsInSameAnonymousTree(parent, this)) {
     // This node is distributed to insertion points, thus we
     // need to consult the destination insertion points list to
@@ -218,9 +218,9 @@ nsIContent::GetFlattenedTreeParentNodeInternal(FlattenedParentType aType) const
     parent = destInsertionPoints && !destInsertionPoints->IsEmpty() ?
       destInsertionPoints->LastElement()->GetParent() : nullptr;
   } else if (HasFlag(NODE_MAY_BE_IN_BINDING_MNGR)) {
-    nsIContent* insertionParent = GetXBLInsertionParent();
+    if (nsIContent* insertionPoint = GetXBLInsertionPoint()) {
-    if (insertionParent) {
+      parent = insertionPoint->GetParent();
-      parent = insertionParent;
+      MOZ_ASSERT(parent);
     }
   }
 

dom/base/nsContentUtils.cpp

@@ -4805,8 +4805,7 @@ nsContentUtils::HasMutationListeners(nsINode* aNode,
     return false;
   }
 
-  if (aNode->IsNodeOfType(nsINode::eCONTENT) &&
+  if (aNode->IsContent() && aNode->AsContent()->ChromeOnlyAccess()) {
-      static_cast<nsIContent*>(aNode)->ChromeOnlyAccess()) {
     return false;
   }
 
@@ -4832,11 +4831,11 @@ nsContentUtils::HasMutationListeners(nsINode* aNode,
       return true;
     }
 
-    if (aNode->IsNodeOfType(nsINode::eCONTENT)) {
+    if (aNode->IsContent()) {
-      nsIContent* content = static_cast<nsIContent*>(aNode);
+      nsIContent* insertionPoint = aNode->AsContent()->GetXBLInsertionPoint();
-      nsIContent* insertionParent = content->GetXBLInsertionParent();
+      if (insertionPoint) {
-      if (insertionParent) {
+        aNode = insertionPoint->GetParent();
-        aNode = insertionParent;
+        MOZ_ASSERT(aNode);
         continue;
       }
     }

layout/base/nsCSSFrameConstructor.cpp

@@ -7491,17 +7491,7 @@ nsCSSFrameConstructor::GetRangeInsertionPoint(nsIContent* aContainer,
     return insertionPoint; // Don't build the frames.
   }
 
-  bool hasInsertion = false;
+  if (insertionPoint.mMultiple || aStartChild->GetXBLInsertionPoint()) {
-  if (!insertionPoint.mMultiple) {
-    // XXXbz XBL2/sXBL issue
-    nsIDocument* document = aStartChild->GetComposedDoc();
-    // XXXbz how would |document| be null here?
-    if (document && aStartChild->GetXBLInsertionParent()) {
-      hasInsertion = true;
-    }
-  }
-
-  if (insertionPoint.mMultiple || hasInsertion) {
     // We have an insertion point.  There are some additional tests we need to do
     // in order to ensure that an append is a safe operation.
     uint32_t childCount = 0;