Merge m-c to inbound.

2013-08-02 11:07:57 +02:00
parent 0c30962e5b 57036a04ae
commit 29d6d162dc
398 changed files with 4101 additions and 5160 deletions
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -1148,6 +1148,8 @@ FragmentOrElement::ClearContentUnbinder()
  ContentUnbinder::UnbindAll();
 }

+NS_IMPL_CYCLE_COLLECTION_CLASS(FragmentOrElement)
+
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(FragmentOrElement)
  nsINode::Unlink(tmp);