Bug 773945, remove nsXULElement::mPrototype, part 2, r=bz

content/base/public/nsIDocument.h

@@ -1205,6 +1205,11 @@ public:
     return mLoadedAsData;
   }
 
+  bool IsLoadedAsInteractiveData()
+  {
+    return mLoadedAsInteractiveData;
+  }
+
   bool MayStartLayout()
   {
     return mMayStartLayout;
@@ -1799,6 +1804,11 @@ protected:
   // as scripts and plugins, disabled.
   bool mLoadedAsData;
 
+  // This flag is only set in nsXMLDocument, for e.g. documents used in XBL. We
+  // don't want animations to play in such documents, so we need to store the
+  // flag here so that we can check it in nsDocument::GetAnimationController.
+  bool mLoadedAsInteractiveData;
+
   // If true, whoever is creating the document has gotten it to the
   // point where it's safe to start layout on it.
   bool mMayStartLayout;

content/base/src/nsDocument.h

@@ -1173,11 +1173,6 @@ protected:
 
   bool mInXBLUpdate:1;
 
-  // This flag is only set in nsXMLDocument, for e.g. documents used in XBL. We
-  // don't want animations to play in such documents, so we need to store the
-  // flag here so that we can check it in nsDocument::GetAnimationController.
-  bool mLoadedAsInteractiveData:1;
-
   // Whether we're currently holding a lock on all of our images.
   bool mLockingImages:1;
 

content/base/src/nsNodeUtils.cpp

@@ -575,8 +575,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
 #ifdef MOZ_XUL
   if (aClone && !aParent && aNode->IsElement() &&
       aNode->AsElement()->IsXUL()) {
-    nsXULElement *xulElem = static_cast<nsXULElement*>(elem);
+    if (!aNode->OwnerDoc()->IsLoadedAsInteractiveData()) {
-    if (!xulElem->mPrototype || xulElem->IsInDoc()) {
       clone->SetFlags(NODE_FORCE_XBL_BINDINGS);
     }
   }

content/xul/content/src/nsXULElement.h

@@ -500,9 +500,6 @@ public:
 
     virtual nsIDOMNode* AsDOMNode() { return this; }
 protected:
-    // XXX This can be removed when nsNodeUtils::CloneAndAdopt doesn't need
-    //     access to mPrototype anymore.
-    friend class nsNodeUtils;
 
     // This can be removed if EnsureContentsGenerated dies.
     friend class nsNSElementTearoff;