merge

browser/base/content/test/browser_ctrlTab.js

@@ -77,6 +77,9 @@ function test() {
   function releaseCtrl()
     EventUtils.synthesizeKey("VK_CONTROL", { type: "keyup" });
 
+  function isOpen()
+    ctrlTab.panel.state == "showing" || ctrlTab.panel.state == "open";
+
   function assertTabs(aTabs) {
     var tabs = gBrowser.mTabs.length;
     if (tabs != aTabs) {
@@ -110,7 +113,7 @@ function test() {
     }
 
     if (tabCount > 2) {
-      ok(ctrlTab.panel.state == "showing" || ctrlTab.panel.state == "open",
+      ok(isOpen(),
          "With " + tabCount + " tabs open, Ctrl+Tab opens the preview panel");
 
       is(ctrlTab.label.value, gBrowser.mTabs[expectedIndex].label,
@@ -118,10 +121,10 @@ function test() {
 
       releaseCtrl();
 
-      ok(ctrlTab.panel.state == "hiding" || ctrlTab.panel.state == "closed",
+      ok(!isOpen(),
          "Releasing Ctrl closes the preview panel");
     } else {
-      ok(ctrlTab.panel.state == "hiding" || ctrlTab.panel.state == "closed",
+      ok(!isOpen(),
          "With " + tabCount + " tabs open, Ctrl+Tab doesn't open the preview panel");
     }
 

content/base/public/nsIContent.h

@@ -902,6 +902,15 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIContent, NS_ICONTENT_IID)
     nsContentUtils::TraverseListenerManager(tmp, cb);     \
   }
 
+#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_PRESERVED_WRAPPER      \
+  {                                                              \
+    nsISupports *preservedWrapper = nsnull;                      \
+    if (tmp->GetOwnerDoc())                                      \
+      preservedWrapper = tmp->GetOwnerDoc()->GetReference(tmp);  \
+    NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "[preserved wrapper]");\
+    cb.NoteXPCOMChild(preservedWrapper);                         \
+  }
+
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_USERDATA \
   if (tmp->HasProperties()) {                      \
     nsNodeUtils::TraverseUserData(tmp, cb);        \
@@ -913,6 +922,10 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIContent, NS_ICONTENT_IID)
     tmp->UnsetFlags(NODE_HAS_LISTENERMANAGER);          \
   }
 
+#define NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER \
+  if (tmp->GetOwnerDoc())                                 \
+    tmp->GetOwnerDoc()->RemoveReference(tmp);
+
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_USERDATA \
   if (tmp->HasProperties()) {                    \
     nsNodeUtils::UnlinkUserData(tmp);            \

content/base/public/nsIDocument.h

@@ -96,8 +96,8 @@ class nsFrameLoader;
 
 // IID for the nsIDocument interface
 #define NS_IDOCUMENT_IID      \
-{ 0x92b19d1c, 0x8f37, 0x4d4b, \
+{ 0x6304ae8e, 0x2634, 0x45ed, \
-  { 0xa3, 0x42, 0xb5, 0xc6, 0x8b, 0x54, 0xde, 0x6c } }
+  { 0x9e, 0x09, 0x83, 0x09, 0x5b, 0x46, 0x72, 0x8b } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -677,6 +677,10 @@ public:
   virtual void ResetToURI(nsIURI *aURI, nsILoadGroup* aLoadGroup,
                           nsIPrincipal* aPrincipal) = 0;
 
+  virtual void AddReference(void *aKey, nsISupports *aReference) = 0;
+  virtual nsISupports *GetReference(void *aKey) = 0;
+  virtual void RemoveReference(void *aKey) = 0;
+
   /**
    * Set the container (docshell) for this document.
    */

content/base/public/nsINode.h

@@ -44,7 +44,6 @@
 #include "nsTObserverArray.h"
 #include "nsINodeInfo.h"
 #include "nsCOMPtr.h"
-#include "nsWrapperCache.h"
 
 class nsIContent;
 class nsIDocument;
@@ -151,17 +150,16 @@ inline nsINode* NODE_FROM(C& aContent, D& aDocument)
 
 // IID for the nsINode interface
 #define NS_INODE_IID \
-{ 0x0f7b2557, 0xa09d, 0x468f, \
+{ 0x2593b0d5, 0x9a06, 0x4d6b, \
-  { 0x93, 0x92, 0xf1, 0xf1, 0xd1, 0xfa, 0x31, 0x78 } }
+  { 0x9a, 0x10, 0xb1, 0x39, 0x9f, 0x1b, 0xa0, 0x8e } }
+
 
 /**
  * An internal interface that abstracts some DOMNode-related parts that both
  * nsIContent and nsIDocument share.  An instance of this interface has a list
  * of nsIContent children and provides access to them.
  */
-class nsINode : public nsPIDOMEventTarget,
+class nsINode : public nsPIDOMEventTarget {
-                public nsWrapperCache
-{
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_INODE_IID)
 
@@ -852,12 +850,4 @@ extern const nsIID kThisPtrOffsetsSID;
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINode, NS_INODE_IID)
 
-
-#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_PRESERVED_WRAPPER \
-   tmp->TraverseWrapper(cb);
-
-#define NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER \
-  tmp->ClearWrapper();
-
-
 #endif /* nsINode_h___ */

content/base/src/nsContentList.cpp

@@ -358,7 +358,6 @@ nsContentList::~nsContentList()
 
 // QueryInterface implementation for nsContentList
 NS_INTERFACE_TABLE_HEAD(nsContentList)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_NODELIST_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsContentList)
     NS_CONTENT_LIST_INTERFACES(nsContentList)
     NS_INTERFACE_TABLE_ENTRY(nsContentList, nsIHTMLCollection)

content/base/src/nsContentList.h

@@ -54,7 +54,6 @@
 #include "nsIAtom.h"
 #include "nsINameSpaceManager.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
 
 // Magic namespace id that means "match all namespaces".  This is
 // negative so it won't collide with actual namespace constants.
@@ -183,8 +182,7 @@ protected:
 class nsContentList : public nsBaseContentList,
                       protected nsContentListKey,
                       public nsIHTMLCollection,
-                      public nsStubMutationObserver,
+                      public nsStubMutationObserver
-                      public nsWrapperCache
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED

content/base/src/nsContentUtils.cpp

@@ -1119,6 +1119,15 @@ nsContentUtils::doReparentContentWrapper(nsIContent *aNode,
                                                 getter_AddRefs(old_wrapper));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (aOldDocument) {
+    nsCOMPtr<nsISupports> old_ref = aOldDocument->GetReference(aNode);
+    if (old_ref) {
+      // Transfer the reference from aOldDocument to aNewDocument
+      aOldDocument->RemoveReference(aNode);
+      aNewDocument->AddReference(aNode, old_ref);
+    }
+  }
+
   // Whether or not aChild is already wrapped we must iterate through
   // its descendants since there's no guarantee that a descendant isn't
   // wrapped even if this child is not wrapped. That used to be true

content/base/src/nsDOMAttribute.cpp

@@ -101,7 +101,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMAttribute)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 // QueryInterface implementation for nsDOMAttribute
 NS_INTERFACE_TABLE_HEAD(nsDOMAttribute)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_NODE_INTERFACE_TABLE7(nsDOMAttribute, nsIDOMAttr, nsIAttribute, nsINode,
                            nsIDOMNode, nsIDOM3Node, nsIDOM3Attr,
                            nsPIDOMEventTarget)

content/base/src/nsDocument.cpp

@@ -1567,12 +1567,13 @@ nsDocument::~nsDocument()
     mBoxObjectTable->EnumerateRead(ClearAllBoxObjects, nsnull);
     delete mBoxObjectTable;
   }
+
+  delete mContentWrapperHash;
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsDocument)
 
 NS_INTERFACE_TABLE_HEAD(nsDocument)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_DOCUMENT_INTERFACE_TABLE_BEGIN(nsDocument)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsINode)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDocument)
@@ -1752,7 +1753,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mCatalogSheets)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mVisitednessChangedURIs)
 
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_PRESERVED_WRAPPER
+  // Traverse any associated preserved wrapper.
+  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "[preserved wrapper]");
+  cb.NoteXPCOMChild(tmp->GetReference(tmp));
 
   if (tmp->mSubDocuments && tmp->mSubDocuments->ops) {
     PL_DHashTableEnumerate(tmp->mSubDocuments, SubDocTraverser, &cb);
@@ -1783,9 +1786,11 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK_USERDATA
 
-  tmp->mParentDocument = nsnull;
+  // Drop the content hash.
+  delete tmp->mContentWrapperHash;
+  tmp->mContentWrapperHash = nsnull;
 
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  tmp->mParentDocument = nsnull;
 
   // nsDocument has a pretty complex destructor, so we're going to
   // assume that *most* cycles you actually want to break somewhere
@@ -6223,6 +6228,41 @@ nsDocument::FlushPendingNotifications(mozFlushType aType)
   }
 }
 
+void
+nsDocument::AddReference(void *aKey, nsISupports *aReference)
+{
+  if (mScriptGlobalObject) {
+    if (!mContentWrapperHash) {
+      mContentWrapperHash = new nsInterfaceHashtable<nsVoidPtrHashKey, nsISupports>;
+      if (mContentWrapperHash) {
+        mContentWrapperHash->Init(10);
+      }
+    }
+    
+    if (mContentWrapperHash)
+      mContentWrapperHash->Put(aKey, aReference);
+  }
+}
+
+nsISupports*
+nsDocument::GetReference(void *aKey)
+{
+  // NB: This method is part of content cycle collection,
+  // and must *not* Addref its return value.
+    
+  if (mContentWrapperHash)
+    return mContentWrapperHash->GetWeak(aKey);
+  return nsnull;
+}
+
+void
+nsDocument::RemoveReference(void *aKey)
+{
+  if (mContentWrapperHash) {
+    mContentWrapperHash->Remove(aKey);
+  }
+}
+
 nsIScriptEventManager*
 nsDocument::GetScriptEventManager()
 {
@@ -6834,6 +6874,13 @@ nsDocument::Destroy()
   // leak-fixing if we fix DocumentViewerImpl to do cycle-collection, but
   // tearing down all those frame trees right now is the right thing to do.
   mExternalResourceMap.Shutdown();
+
+  // XXX We really should let cycle collection do this, but that currently still
+  //     leaks (see https://bugzilla.mozilla.org/show_bug.cgi?id=406684).
+  //     When we start relying on cycle collection again we should remove the
+  //     check for mScriptGlobalObject in AddReference.
+  delete mContentWrapperHash;
+  mContentWrapperHash = nsnull;
 }
 
 void

content/base/src/nsDocument.h

@@ -750,6 +750,9 @@ public:
                                 nsIStyleRule* aStyleRule);
 
   virtual void FlushPendingNotifications(mozFlushType aType);
+  virtual void AddReference(void *aKey, nsISupports *aReference);
+  virtual nsISupports *GetReference(void *aKey);
+  virtual void RemoveReference(void *aKey);
   virtual nsIScriptEventManager* GetScriptEventManager();
   virtual void SetXMLDeclaration(const PRUnichar *aVersion,
                                  const PRUnichar *aEncoding,
@@ -1155,6 +1158,7 @@ protected:
   PRUint8 mIdMissCount;
 
   nsInterfaceHashtable<nsVoidPtrHashKey, nsPIBoxObject> *mBoxObjectTable;
+  nsInterfaceHashtable<nsVoidPtrHashKey, nsISupports> *mContentWrapperHash;
 
   // The channel that got passed to StartDocumentLoad(), if any
   nsCOMPtr<nsIChannel> mChannel;

content/base/src/nsGenericDOMDataNode.cpp

@@ -105,9 +105,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGenericDOMDataNode)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_INTERFACE_MAP_BEGIN(nsGenericDOMDataNode)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericDOMDataNode)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGenericDOMDataNode)
   NS_INTERFACE_MAP_ENTRY(nsIContent)
   NS_INTERFACE_MAP_ENTRY(nsINode)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget)

content/base/src/nsGenericElement.cpp

@@ -462,7 +462,6 @@ NS_IMPL_ADDREF(nsChildContentList)
 NS_IMPL_RELEASE(nsChildContentList)
 
 NS_INTERFACE_TABLE_HEAD(nsChildContentList)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_NODELIST_OFFSET_AND_INTERFACE_TABLE_BEGIN(nsChildContentList)
     NS_INTERFACE_TABLE_ENTRY(nsChildContentList, nsINodeList)
     NS_INTERFACE_TABLE_ENTRY(nsChildContentList, nsIDOMNodeList)
@@ -4067,9 +4066,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGenericElement)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 
-NS_INTERFACE_MAP_BEGIN(nsGenericElement)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericElement)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsGenericElement)
   NS_INTERFACE_MAP_ENTRY(nsIContent)
   NS_INTERFACE_MAP_ENTRY(nsINode)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget)

content/base/src/nsGenericElement.h

@@ -89,8 +89,7 @@ typedef unsigned long PtrBits;
  * and Item to its existing child list.
  * @see nsIDOMNodeList
  */
-class nsChildContentList : public nsINodeList,
+class nsChildContentList : public nsINodeList
-                           public nsWrapperCache
 {
 public:
   nsChildContentList(nsINode* aNode)
@@ -111,27 +110,6 @@ public:
     mNode = nsnull;
   }
 
-  nsISupports* GetParentObject()
-  {
-    return mNode;
-  }
-
-  static nsChildContentList* FromSupports(nsISupports* aSupports)
-  {
-    nsINodeList* list = static_cast<nsINodeList*>(aSupports);
-#ifdef DEBUG
-    {
-      nsCOMPtr<nsINodeList> list_qi = do_QueryInterface(aSupports);
-
-      // If this assertion fires the QI implementation for the object in
-      // question doesn't use the nsINodeList pointer as the nsISupports
-      // pointer. That must be fixed, or we'll crash...
-      NS_ASSERTION(list_qi == list, "Uh, fix QI!");
-    }
-#endif
-    return static_cast<nsChildContentList*>(list);
-  }
-
 private:
   // The node whose children make up the list (weak reference)
   nsINode* mNode;

content/base/src/nsNodeUtils.cpp

@@ -564,15 +564,26 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep,
     }
   }
   else if (nodeInfoManager) {
+    nsCOMPtr<nsISupports> oldRef;
     nsIDocument* oldDoc = aNode->GetOwnerDoc();
-    if (oldDoc && aNode->IsNodeOfType(nsINode::eELEMENT)) {
+    if (oldDoc) {
-      oldDoc->ClearBoxObjectFor(static_cast<nsIContent*>(aNode));
+      if (aNode->IsNodeOfType(nsINode::eELEMENT)) {
+        oldDoc->ClearBoxObjectFor(static_cast<nsIContent*>(aNode));
+      }
+      oldRef = oldDoc->GetReference(aNode);
+      if (oldRef) {
+        oldDoc->RemoveReference(aNode);
+      }
     }
 
     aNode->mNodeInfo.swap(newNodeInfo);
 
     nsIDocument* newDoc = aNode->GetOwnerDoc();
     if (newDoc) {
+      if (oldRef) {
+        newDoc->AddReference(aNode, oldRef);
+      }
+
       nsPIDOMWindow* window = newDoc->GetInnerWindow();
       if (window) {
         nsCOMPtr<nsIEventListenerManager> elm;

content/base/src/nsXMLHttpRequest.cpp

@@ -530,7 +530,13 @@ GetDocumentFromScriptContext(nsIScriptContext *aScriptContext)
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsXHREventTarget)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXHREventTarget)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_PRESERVED_WRAPPER
+  if (tmp->mOwner) {
+    nsCOMPtr<nsIDocument> doc =
+      do_QueryInterface(tmp->mOwner->GetExtantDocument());
+    if (doc) {
+      cb.NoteXPCOMChild(doc->GetReference(tmp));
+    }
+  }
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnLoadListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnErrorListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnAbortListener)
@@ -542,7 +548,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXHREventTarget)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsXHREventTarget)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  if (tmp->mOwner) {
+    nsCOMPtr<nsIDocument> doc =
+      do_QueryInterface(tmp->mOwner->GetExtantDocument());
+    if (doc) {
+      doc->RemoveReference(tmp);
+    }
+  }
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnLoadListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnErrorListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnAbortListener)
@@ -553,9 +565,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsXHREventTarget)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOwner)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_INTERFACE_MAP_BEGIN(nsXHREventTarget)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXHREventTarget)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsXHREventTarget)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXMLHttpRequestEventTarget)
   NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget)

content/base/src/nsXMLHttpRequest.h

@@ -73,7 +73,6 @@
 #include "nsITimer.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsDOMProgressEvent.h"
-#include "nsIScriptGlobalObject.h"
 
 class nsILoadGroup;
 
@@ -160,8 +159,7 @@ protected:
 
 class nsXHREventTarget : public nsIXMLHttpRequestEventTarget,
                          public nsPIDOMEventTarget,
-                         public nsIDOMNSEventTarget,
+                         public nsIDOMNSEventTarget
-                         public nsWrapperCache
 {
 public:
   nsXHREventTarget() : mLang(nsIProgrammingLanguage::JAVASCRIPT) {}
@@ -209,36 +207,6 @@ public:
     }
     return NS_OK;
   }
-
-  void GetParentObject(nsIScriptGlobalObject **aParentObject)
-  {
-    if (mOwner) {
-      CallQueryInterface(mOwner, aParentObject);
-    }
-    else {
-      *aParentObject = nsnull;
-    }
-  }
-
-  static nsXHREventTarget* FromSupports(nsISupports* aSupports)
-  {
-    nsIXMLHttpRequestEventTarget* target =
-      static_cast<nsIXMLHttpRequestEventTarget*>(aSupports);
-#ifdef DEBUG
-    {
-      nsCOMPtr<nsIXMLHttpRequestEventTarget> target_qi =
-        do_QueryInterface(aSupports);
-
-      // If this assertion fires the QI implementation for the object in
-      // question doesn't use the nsIXMLHttpRequestEventTarget pointer as the
-      // nsISupports pointer. That must be fixed, or we'll crash...
-      NS_ASSERTION(target_qi == target, "Uh, fix QI!");
-    }
-#endif
-
-    return static_cast<nsXHREventTarget*>(target);
-  }
-
 protected:
   nsRefPtr<nsDOMEventListenerWrapper> mOnLoadListener;
   nsRefPtr<nsDOMEventListenerWrapper> mOnErrorListener;

content/html/content/src/nsHTMLSharedObjectElement.cpp

@@ -51,7 +51,7 @@
 
 // XXX this is to get around conflicts with windows.h defines
 // introduced through jni.h
-#if defined (XP_WIN) && ! defined (WINCE)
+#ifdef XP_WIN
 #undef GetClassName
 #undef GetObject
 #endif

content/xbl/src/nsXBLProtoImpl.cpp

@@ -151,7 +151,13 @@ nsXBLProtoImpl::InitTargetObjects(nsXBLPrototypeBinding* aBinding,
   if (NS_FAILED(rv))
     return rv;
 
-  aBoundElement->PreserveWrapper();
+  // Root ourselves in the document.
+  nsIDocument* doc = aBoundElement->GetOwnerDoc();
+  if (doc) {
+    nsCOMPtr<nsIXPConnectWrappedNative> nativeWrapper(do_QueryInterface(wrapper));
+    if (nativeWrapper)
+      doc->AddReference(aBoundElement, nativeWrapper);
+  }
 
   wrapper.swap(*aScriptObjectHolder);
   

dom/public/Makefile.in

@@ -71,7 +71,6 @@ EXPORTS=nsIScriptContext.h		\
 	nsDOMString.h			\
 	nsDOMJSUtils.h			\
 	nsDOMScriptObjectHolder.h	\
-	nsWrapperCache.h	\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

dom/public/nsWrapperCache.h

@@ -1,137 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Gecko DOM code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsWrapperCache_h___
-#define nsWrapperCache_h___
-
-#include "nsCycleCollectionParticipant.h"
-
-typedef unsigned long PtrBits;
-
-#define NS_WRAPPERCACHE_IID \
-{ 0x3a51ca81, 0xddab, 0x422c, \
-  { 0x95, 0x3a, 0x13, 0x06, 0x28, 0x0e, 0xee, 0x14 } }
-
-/**
- * Class to store the XPCWrappedNative for an object. This can only be used
- * with objects that only have one XPCWrappedNative at a time (usually ensured
- * by setting an explicit parent in the PreCreate hook for the class). This
- * object can be gotten by calling QueryInterface, note that this breaks XPCOM
- * rules a bit (this object doesn't derive from nsISupports).
- */
-class nsWrapperCache
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_WRAPPERCACHE_IID)
-
-  nsWrapperCache() : mWrapperPtrBits(0)
-  {
-  }
-  ~nsWrapperCache()
-  {
-    if (PreservingWrapper()) {
-      GetWrapper()->Release();
-    }
-  }
-
-  /**
-   * This method returns an nsIXPConnectWrappedNative, but we want to avoid
-   * including nsIXPConnect, because we don't want to make everyone require
-   * JS and XPConnect.
-   */
-  nsISupports* GetWrapper()
-  {
-    return reinterpret_cast<nsISupports*>(mWrapperPtrBits & ~kWrapperBitMask);
-  }
-
-  /**
-   * This method takes an nsIXPConnectWrappedNative, but we want to avoid
-   * including nsIXPConnect, because we don't want to make everyone require
-   * JS and XPConnect.
-   */
-  void SetWrapper(nsISupports* aWrapper)
-  {
-    NS_ASSERTION(!mWrapperPtrBits, "Already have a wrapper!");
-    mWrapperPtrBits = reinterpret_cast<PtrBits>(aWrapper);
-  }
-
-  void ClearWrapper()
-  {
-    if (PreservingWrapper()) {
-      GetWrapper()->Release();
-    }
-    mWrapperPtrBits = 0;
-  }
-
-  void PreserveWrapper()
-  {
-    NS_ASSERTION(mWrapperPtrBits, "No wrapper to preserve?");
-    if (!PreservingWrapper()) {
-      NS_ADDREF(reinterpret_cast<nsISupports*>(mWrapperPtrBits));
-      mWrapperPtrBits |= WRAPPER_BIT_PRESERVED;
-    }
-  }
-
-  void TraverseWrapper(nsCycleCollectionTraversalCallback &cb)
-  {
-    if (PreservingWrapper()) {
-      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mWrapper");
-      cb.NoteXPCOMChild(GetWrapper());
-    }
-  }
-
-private:
-  PRBool PreservingWrapper()
-  {
-    return mWrapperPtrBits & WRAPPER_BIT_PRESERVED;
-  }
-
-  enum { WRAPPER_BIT_PRESERVED = 1 << 0 };
-  enum { kWrapperBitMask = 0x1 };
-
-  PtrBits mWrapperPtrBits;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsWrapperCache, NS_WRAPPERCACHE_IID)
-
-#define NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY                                   \
-  if ( aIID.Equals(NS_GET_IID(nsWrapperCache)) ) {                            \
-    *aInstancePtr = static_cast<nsWrapperCache*>(this);                       \
-    return NS_OK;                                                             \
-  }
-
-#endif /* nsWrapperCache_h___ */

dom/src/base/nsDOMClassInfo.cpp

@@ -152,16 +152,16 @@
 #ifdef OJI
 // HTMLAppletElement helper includes
 #include "nsIJVMManager.h"
-
-// Oh, did I mention that I hate Microsoft for doing this to me?
-#ifndef WINCE
-#undef GetClassName
-#endif
-
 #include "nsILiveConnectManager.h"
 #include "nsIJVMPluginInstance.h"
 #endif
 
+// Oh, did I mention that I hate Microsoft for doing this to me?
+#ifdef XP_WIN
+#undef GetClassName
+#endif
+
+
 // HTMLOptionsCollection includes
 #include "nsIDOMHTMLOptionElement.h"
 #include "nsIDOMNSHTMLOptionElement.h"
@@ -171,7 +171,6 @@
 
 // ContentList includes
 #include "nsContentList.h"
-#include "nsGenericElement.h"
 
 // Event related includes
 #include "nsIEventListenerManager.h"
@@ -213,7 +212,7 @@
 #include "nsIDOMLSProgressEvent.h"
 #include "nsIDOMParser.h"
 #include "nsIDOMSerializer.h"
-#include "nsXMLHttpRequest.h"
+#include "nsIXMLHttpRequest.h"
 
 // includes needed for the prototype chain interfaces
 #include "nsIDOMNavigator.h"
@@ -490,8 +489,7 @@ static const char kDOMStringBundleURL[] =
  ((DOM_DEFAULT_SCRIPTABLE_FLAGS |                                             \
    nsIXPCScriptable::WANT_GETPROPERTY |                                       \
    nsIXPCScriptable::WANT_ADDPROPERTY |                                       \
-   nsIXPCScriptable::WANT_SETPROPERTY |                                       \
+   nsIXPCScriptable::WANT_SETPROPERTY) &                                      \
-   nsIXPCScriptable::WANT_FINALIZE) &                                         \
   ~nsIXPCScriptable::USE_JSSTUB_FOR_ADDPROPERTY)
 
 // We need to let JavaScript QI elements to interfaces that are not in
@@ -515,22 +513,15 @@ static const char kDOMStringBundleURL[] =
    nsIXPCScriptable::WANT_ADDPROPERTY |                                       \
    nsIXPCScriptable::WANT_DELPROPERTY |                                       \
    nsIXPCScriptable::WANT_GETPROPERTY |                                       \
-   nsIXPCScriptable::WANT_ENUMERATE)
+   nsIXPCScriptable::WANT_ENUMERATE   |                                       \
+   nsIXPCScriptable::WANT_POSTCREATE  |                                       \
+   nsIXPCScriptable::WANT_FINALIZE)
 
 #define ARRAY_SCRIPTABLE_FLAGS                                                \
   (DOM_DEFAULT_SCRIPTABLE_FLAGS       |                                       \
    nsIXPCScriptable::WANT_GETPROPERTY |                                       \
    nsIXPCScriptable::WANT_ENUMERATE)
 
-#define NODELIST_SCRIPTABLE_FLAGS                                             \
-  (ARRAY_SCRIPTABLE_FLAGS             |                                       \
-   nsIXPCScriptable::WANT_FINALIZE)
-
-#define EVENTTARGET_SCRIPTABLE_FLAGS                                          \
-  (DOM_DEFAULT_SCRIPTABLE_FLAGS       |                                       \
-   nsIXPCScriptable::WANT_ADDPROPERTY |                                       \
-   nsIXPCScriptable::WANT_FINALIZE)
-
 #define DOMCLASSINFO_STANDARD_FLAGS                                           \
   (nsIClassInfo::MAIN_THREAD_ONLY | nsIClassInfo::DOM_OBJECT)
 
@@ -641,7 +632,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(ProcessingInstruction, nsNodeSH,
                            NODE_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(Notation, nsNodeSH, NODE_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(NodeList, nsNodeListSH, NODELIST_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(NodeList, nsNodeListSH, ARRAY_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(NamedNodeMap, nsNamedNodeMapSH,
                            ARRAY_SCRIPTABLE_FLAGS)
 
@@ -892,7 +883,9 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ARRAY_SCRIPTABLE_FLAGS)
 
   NS_DEFINE_CLASSINFO_DATA_WITH_NAME(ContentList, HTMLCollection,
-                                     nsContentListSH, NODELIST_SCRIPTABLE_FLAGS)
+                                     nsContentListSH,
+                                     ARRAY_SCRIPTABLE_FLAGS |
+                                     nsIXPCScriptable::WANT_PRECREATE)
 
   NS_DEFINE_CLASSINFO_DATA(XMLStylesheetProcessingInstruction, nsNodeSH,
                            NODE_SCRIPTABLE_FLAGS)
@@ -1213,7 +1206,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(XMLHttpProgressEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(XMLHttpRequest, nsEventTargetSH,
-                           EVENTTARGET_SCRIPTABLE_FLAGS)
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS |
+                           nsIXPCScriptable::WANT_ADDPROPERTY)
 
   NS_DEFINE_CLASSINFO_DATA(ClientRect, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -1284,7 +1278,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
   NS_DEFINE_CLASSINFO_DATA(XMLHttpRequestUpload, nsEventTargetSH,
-                           EVENTTARGET_SCRIPTABLE_FLAGS)
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS |
+                           nsIXPCScriptable::WANT_ADDPROPERTY)
 
   // DOM Traversal NodeIterator class  
   NS_DEFINE_CLASSINFO_DATA(NodeIterator, nsDOMGenericSH,
@@ -4187,14 +4182,28 @@ nsDOMClassInfo::GetClassInfoInstance(nsDOMClassInfoData* aData)
 }
 
 // static
-void
+nsresult
 nsDOMClassInfo::PreserveNodeWrapper(nsIXPConnectWrappedNative *aWrapper)
 {
-  nsWrapperCache* cache;
+   nsISupports *native = aWrapper->Native();
-  CallQueryInterface(aWrapper->Native(), &cache);
+   nsCOMPtr<nsIDOMNode> node(do_QueryInterface(native));
-  if (cache) {
+   
-    cache->PreserveWrapper();
+   nsCOMPtr<nsIDocument> doc;
+   if (node) {
+     nsCOMPtr<nsIDOMDocument> domdoc;
+     node->GetOwnerDocument(getter_AddRefs(domdoc));
+     doc = do_QueryInterface(domdoc);
   }
+
+   if (!doc) {
+     doc = do_QueryInterface(native);
+   }
+
+   if (doc) {
+     nsCOMPtr<nsINode> n(do_QueryInterface(node));
+     doc->AddReference(n, aWrapper);
+   }
+   return NS_OK;
 }
 
 
@@ -6916,16 +6925,6 @@ nsNodeSH::PreCreate(nsISupports *nativeObj, JSContext *cx, JSObject *globalObj,
   return rv;
 }
 
-NS_IMETHODIMP
-nsNodeSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                     JSObject *obj)
-{
-  nsINode* node = static_cast<nsINode*>(wrapper->Native());
-  node->SetWrapper(wrapper);
-
-  return nsEventReceiverSH::PostCreate(wrapper, cx, obj);
-}
-
 NS_IMETHODIMP
 nsNodeSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                       JSObject *obj, jsval id, jsval *vp, PRBool *_retval)
@@ -6944,13 +6943,6 @@ nsNodeSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     return DefineVoidProp(cx, obj, id, objp);
   }
 
-  if (id == sOnload_id || id == sOnerror_id) {
-    // Make sure that this node can't go away while waiting for a
-    // network load that could fire an event handler.
-    nsINode* node = static_cast<nsINode*>(wrapper->Native());
-    node->PreserveWrapper();
-  }
-
   return nsEventReceiverSH::NewResolve(wrapper, cx, obj, id, flags, objp,
                                        _retval);
 }
@@ -7019,16 +7011,6 @@ nsNodeSH::GetFlags(PRUint32 *aFlags)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsNodeSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                   JSObject *obj)
-{
-  nsINode* node = static_cast<nsINode*>(wrapper->Native());
-  node->ClearWrapper();
-
-  return NS_OK;
-}
- 
 // EventReceiver helper
 
 // static
@@ -7279,6 +7261,12 @@ nsEventReceiverSH::NewResolve(nsIXPConnectWrappedNative *wrapper,
                               JSContext *cx, JSObject *obj, jsval id,
                               PRUint32 flags, JSObject **objp, PRBool *_retval)
 {
+  if (id == sOnload_id || id == sOnerror_id) {    
+    // Make sure that this node can't go away while waiting for a
+    // network load that could fire an event handler.
+    nsDOMClassInfo::PreserveNodeWrapper(wrapper);
+  }
+
   if (!JSVAL_IS_STRING(id)) {
     return NS_OK;
   }
@@ -7363,30 +7351,6 @@ nsEventReceiverSH::AddProperty(nsIXPConnectWrappedNative *wrapper,
 
 // EventTarget helper
 
-NS_IMETHODIMP
-nsEventTargetSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
-                           JSObject *globalObj, JSObject **parentObj)
-{
-  nsXHREventTarget *target = nsXHREventTarget::FromSupports(nativeObj);
-
-  nsCOMPtr<nsIScriptGlobalObject> native_parent;
-  target->GetParentObject(getter_AddRefs(native_parent));
-
-  *parentObj = native_parent ? native_parent->GetGlobalJSObject() : globalObj;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEventTargetSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                            JSObject *obj)
-{
-  nsXHREventTarget *target = nsXHREventTarget::FromSupports(wrapper->Native());
-  target->SetWrapper(wrapper);
-
-  return nsDOMGenericSH::PostCreate(wrapper, cx, obj);
-}
-
 NS_IMETHODIMP
 nsEventTargetSH::NewResolve(nsIXPConnectWrappedNative *wrapper,
                             JSContext *cx, JSObject *obj, jsval id,
@@ -7409,24 +7373,26 @@ nsEventTargetSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   if (id == sAddEventListener_id) {
     return NS_OK;
   }
-
+  nsISupports* native = wrapper->Native();
-  nsXHREventTarget *target = nsXHREventTarget::FromSupports(wrapper->Native());
+  nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(native);
-  target->PreserveWrapper();
+  if (target) {
-
+    nsCOMPtr<nsIScriptContext> scriptContext;
+    target->GetContextForEventHandlers(getter_AddRefs(scriptContext));
+    if (scriptContext) {
+      nsCOMPtr<nsPIDOMWindow> window =
+        do_QueryInterface(scriptContext->GetGlobalObject());
+      if (window) {
+        nsCOMPtr<nsIDocument> doc =
+          do_QueryInterface(window->GetExtantDocument());
+        if (doc) {
+          doc->AddReference(native, wrapper);
+        }
+      }
+    }
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsEventTargetSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj)
-{
-  nsXHREventTarget *target = nsXHREventTarget::FromSupports(wrapper->Native());
-  target->ClearWrapper();
-
-  return NS_OK;
-}
-
-
 // Element helper
 
 NS_IMETHODIMP
@@ -7699,49 +7665,6 @@ nsArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
 // NodeList scriptable helper
 
-nsresult
-nsNodeListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
-                        JSObject *globalObj, JSObject **parentObj)
-{
-  nsWrapperCache* cache;
-  CallQueryInterface(nativeObj, &cache);
-  if (!cache) {
-    *parentObj = globalObj;
-    return NS_OK;
-  }
-
-  // nsChildContentList is the only class that uses nsNodeListSH and has a
-  // cached wrapper.
-  nsChildContentList *list = nsChildContentList::FromSupports(nativeObj);
-  nsISupports *native_parent = list->GetParentObject();
-  if (!native_parent) {
-    return NS_ERROR_FAILURE;
-  }
-
-  jsval v;
-  nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-  nsresult rv = WrapNative(cx, globalObj, native_parent,
-                           NS_GET_IID(nsISupports), &v,
-                           getter_AddRefs(holder));
-
-  *parentObj = JSVAL_TO_OBJECT(v);
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsNodeListSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                         JSObject *obj)
-{
-  nsWrapperCache* cache;
-  CallQueryInterface(wrapper->Native(), &cache);
-  if (cache) {
-    cache->SetWrapper(wrapper);
-  }
-
-  return nsArraySH::PostCreate(wrapper, cx, obj);
-}
-
 nsresult
 nsNodeListSH::GetLength(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                         JSObject *obj, PRUint32 *length)
@@ -7780,19 +7703,6 @@ nsNodeListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
   return list->GetNodeAt(aIndex);
 }
 
-NS_IMETHODIMP
-nsNodeListSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                       JSObject *obj)
-{
-  nsWrapperCache* cache;
-  CallQueryInterface(wrapper->Native(), &cache);
-  if (cache) {
-    cache->ClearWrapper();
-  }
-
-  return NS_OK;
-}
-
 
 // StringList scriptable helper
 
@@ -7930,7 +7840,8 @@ nsContentListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
   nsISupports *native_parent = contentList->GetParentObject();
 
   if (!native_parent) {
-    return NS_ERROR_FAILURE;
+    *parentObj = globalObj;
+    return NS_OK;
   }
 
   jsval v;
@@ -7944,16 +7855,6 @@ nsContentListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
   return rv;
 }
 
-NS_IMETHODIMP
-nsContentListSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                            JSObject *obj)
-{
-  nsContentList *list = nsContentList::FromSupports(wrapper->Native());
-  list->SetWrapper(wrapper);
-
-  return nsNamedArraySH::PostCreate(wrapper, cx, obj);
-}
-
 nsresult
 nsContentListSH::GetLength(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                            JSObject *obj, PRUint32 *length)
@@ -7981,15 +7882,6 @@ nsContentListSH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
   return list->GetNamedItem(aName, aResult);
 }
 
-NS_IMETHODIMP
-nsContentListSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj)
-{
-  nsContentList *list = nsContentList::FromSupports(wrapper->Native());
-  list->ClearWrapper();
-
-  return NS_OK;
-}
 
 // Document helper for document.location and document.on*
 
@@ -8214,7 +8106,7 @@ nsDocumentSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
   doc->SetJSObject(nsnull);
 
-  return nsNodeSH::Finalize(wrapper, cx, obj);
+  return NS_OK;
 }
 
 // HTMLDocument helper

dom/src/base/nsDOMClassInfo.h

@@ -172,7 +172,7 @@ public:
       ::JS_GET_CLASS(cx, obj) == sXPCNativeWrapperClass;
   }
 
-  static void PreserveNodeWrapper(nsIXPConnectWrappedNative *aWrapper);
+  static nsresult PreserveNodeWrapper(nsIXPConnectWrappedNative *aWrapper);
 
 protected:
   friend nsIClassInfo* NS_GetDOMClassInfoInstance(nsDOMClassInfoID aID);
@@ -400,17 +400,11 @@ protected:
   {
   }
 public:
-  NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
-                       JSObject *globalObj, JSObject **parentObj);
-  NS_IMETHOD PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                        JSObject *obj);
   NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                         JSObject *obj, jsval id, PRUint32 flags,
                         JSObject **objp, PRBool *_retval);
   NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
-  NS_IMETHOD Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                      JSObject *obj);
 
   static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
   {
@@ -562,8 +556,6 @@ protected:
 public:
   NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
                        JSObject *globalObj, JSObject **parentObj);
-  NS_IMETHOD PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                        JSObject *obj);
   NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
   NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
@@ -574,8 +566,6 @@ public:
   NS_IMETHOD SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
   NS_IMETHOD GetFlags(PRUint32 *aFlags);
-  NS_IMETHOD Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                      JSObject *obj);
 
   static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
   {
@@ -678,13 +668,6 @@ protected:
   }
 
 public:
-  NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
-                       JSObject *globalObj, JSObject **parentObj);
-  NS_IMETHOD PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                        JSObject *obj);
-  NS_IMETHOD Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                      JSObject *obj);
-
   virtual nsresult GetLength(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                              JSObject *obj, PRUint32 *length);
   virtual nsISupports* GetItemAt(nsISupports *aNative, PRUint32 aIndex,
@@ -796,10 +779,6 @@ protected:
 public:
   NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
                        JSObject *globalObj, JSObject **parentObj);
-  NS_IMETHOD PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                        JSObject *obj);
-  NS_IMETHOD Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                      JSObject *obj);
 
   virtual nsresult GetLength(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                              JSObject *obj, PRUint32 *length);

dom/src/base/nsGlobalWindow.cpp

@@ -1001,6 +1001,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocumentPrincipal)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDoc)
 
+  // Traverse any associated preserved wrappers.
+  {
+    if (tmp->mDoc) {
+      cb.NoteXPCOMChild(tmp->mDoc->GetReference(tmp));
+    }
+  }
+
   // Traverse stuff from nsPIDOMWindow
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mChromeEventHandler)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocument)
@@ -1033,6 +1040,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mApplicationCache)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDocumentPrincipal)
 
+  // Unlink any associated preserved wrapper.
+  if (tmp->mDoc) {
+    tmp->mDoc->RemoveReference(tmp);
+    NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDoc)
+  }
+
   // Unlink stuff from nsPIDOMWindow
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mChromeEventHandler)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDocument)

dom/src/base/nsJSEnvironment.cpp

@@ -3372,8 +3372,7 @@ nsJSContext::ScriptExecuted()
 NS_IMETHODIMP
 nsJSContext::PreserveWrapper(nsIXPConnectWrappedNative *aWrapper)
 {
-  nsDOMClassInfo::PreserveNodeWrapper(aWrapper);
+  return nsDOMClassInfo::PreserveNodeWrapper(aWrapper);
-  return NS_OK;
 }
 
 //static

gfx/cairo/README

@@ -32,3 +32,6 @@ tmpfile_wince.patch: Make Windows CE use tmpfile() on windows mobile due to the
 
 endian.patch: include cairo-platform.h for endian macros
 
+==== disable printing patch ====
+
+disable-printing.patch:  allows us to use NS_PRINTING to disable printing.

gfx/cairo/cairo/src/Makefile.in

@@ -147,8 +147,14 @@ PS_EXPORTS = cairo-ps.h
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CSRCS	+= 	cairo-win32-font.c \
-			cairo-win32-surface.c \
+			cairo-win32-surface.c
-			cairo-win32-printing-surface.c
+
+ifdef NS_PRINTING
+CSRCS   += cairo-win32-printing-surface.c
+else
+DEFINES += CAIRO_OMIT_WIN32_PRINTING
+endif
+
 EXPORTS += cairo-win32.h
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
 EXPORTS += $(PDF_EXPORTS)

gfx/cairo/cairo/src/cairo-win32-surface.c

@@ -1897,11 +1897,12 @@ cairo_win32_surface_get_dc (cairo_surface_t *surface)
 
 	target = _cairo_paginated_surface_get_target (surface);
 
+#ifndef CAIRO_OMIT_WIN32_PRINTING
 	if (_cairo_surface_is_win32_printing (target)) {
 	    winsurf = (cairo_win32_surface_t *) target;
-
 	    return winsurf->dc;
 	}
+#endif
     }
 
     return NULL;

gfx/cairo/disable-printing.patch

@@ -0,0 +1,27 @@
+diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
+--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
++++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
+@@ -1892,21 +1892,22 @@ cairo_win32_surface_get_dc (cairo_surfac
+ 	return winsurf->dc;
+     }
+ 
+     if (_cairo_surface_is_paginated (surface)) {
+ 	cairo_surface_t *target;
+ 
+ 	target = _cairo_paginated_surface_get_target (surface);
+ 
++#ifndef CAIRO_OMIT_WIN32_PRINTING
+ 	if (_cairo_surface_is_win32_printing (target)) {
+ 	    winsurf = (cairo_win32_surface_t *) target;
+-
+ 	    return winsurf->dc;
+ 	}
++#endif
+     }
+ 
+     return NULL;
+ }
+ 
+ /**
+  * cairo_win32_surface_get_image
+  * @surface: a #cairo_surface_t

gfx/thebes/src/gfxWindowsSurface.cpp

@@ -57,12 +57,13 @@ gfxWindowsSurface::gfxWindowsSurface(HDC dc, PRUint32 flags) :
     if (flags & FLAG_TAKE_DC)
         mOwnsDC = PR_TRUE;
 
+#ifdef NS_PRINTING
     if (flags & FLAG_FOR_PRINTING) {
         Init(cairo_win32_printing_surface_create(mDC));
         mForPrinting = PR_TRUE;
-    } else {
+    } else
+#endif
         Init(cairo_win32_surface_create(mDC));
-    }
 }
 
 gfxWindowsSurface::gfxWindowsSurface(const gfxIntSize& size, gfxImageFormat imageFormat) :

intl/locale/src/windows/nsCollationWin.cpp

@@ -49,11 +49,7 @@
 #include "plstr.h"
 #include <windows.h>
 
-#ifdef WINCE
-#include <Winnls.h>
-#else
 #undef CompareString
-#endif
 
 NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation)
 

js/src/xpconnect/crashtests/crashtests.list

@@ -8,4 +8,3 @@ load 394810-1.html
 load 403356-1.html
 load 418139-1.svg
 load 420513-1.html
-load 462926.html

js/src/xpconnect/src/xpcconvert.cpp

@@ -48,7 +48,6 @@
 #include "nsIAtom.h"
 #include "XPCWrapper.h"
 #include "nsJSPrincipals.h"
-#include "nsWrapperCache.h"
 
 //#define STRICT_CHECK_OF_UNICODE
 #ifdef STRICT_CHECK_OF_UNICODE
@@ -1092,28 +1091,15 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
         if(!iface)
             return JS_FALSE;
 
-        nsresult rv;
         XPCWrappedNative* wrapper;
-        nsWrapperCache* cache;
+        nsresult rv = XPCWrappedNative::GetNewOrUsed(ccx, src, xpcscope,
-        src->QueryInterface(NS_GET_IID(nsWrapperCache), (void**)&cache);
+                                                     iface, isGlobal,
-        if(cache &&
+                                                     &wrapper);
-           (wrapper = static_cast<XPCWrappedNative*>(cache->GetWrapper())))
-        {
-            NS_ADDREF(wrapper);
-            wrapper->FindTearOff(ccx, iface, JS_FALSE, &rv);
-        }
-        else
-        {
-            rv = XPCWrappedNative::GetNewOrUsed(ccx, src, xpcscope, iface,
-                                                isGlobal, &wrapper);
-        }
-
         if(pErr)
             *pErr = rv;
         if(NS_SUCCEEDED(rv) && wrapper)
         {
             uint32 flags = 0;
-            JSObject *flat = wrapper->GetFlatJSObject();
             if (allowNativeWrapper && wrapper->GetScope() != xpcscope)
             {
                 // Cross scope access detected. Check if chrome code
@@ -1171,6 +1157,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
 
                 flags = script ? JS_GetScriptFilenameFlags(script) : 0;
                 NS_ASSERTION(flags != JSFILENAME_NULL, "null script filename");
+                JSObject *flat = wrapper->GetFlatJSObject();
 
                 if(!JS_IsSystemObject(ccx, flat))
                 {
@@ -1278,6 +1265,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
                 }
             }
 
+            JSObject *flat = wrapper->GetFlatJSObject();
             const char *name = STOBJ_GET_CLASS(flat)->name;
             if(allowNativeWrapper &&
                !(flags & JSFILENAME_SYSTEM) &&

js/src/xpconnect/src/xpcquickstubs.h

@@ -266,7 +266,7 @@ public:
 
 struct xpc_qsSelfRef
 {
-    xpc_qsSelfRef() : ptr(nsnull) {}
+    xpc_qsSelfRef() {}
     explicit xpc_qsSelfRef(nsISupports *p) : ptr(p) {}
     ~xpc_qsSelfRef() { NS_IF_RELEASE(ptr); }
 

js/src/xpconnect/src/xpcwrappednative.cpp

@@ -45,7 +45,6 @@
 #include "nsCRT.h"
 #include "XPCNativeWrapper.h"
 #include "XPCWrapper.h"
-#include "nsWrapperCache.h"
 
 /***************************************************************************/
 
@@ -590,13 +589,27 @@ XPCWrappedNative::GetUsedOnly(XPCCallContext& ccx,
                               XPCWrappedNative** resultWrapper)
 {
     NS_ASSERTION(Object, "XPCWrappedNative::GetUsedOnly was called with a null Object");
+    nsCOMPtr<nsISupports> identity;
+#ifdef XPC_IDISPATCH_SUPPORT
+    // XXX See GetNewOrUsed for more info on this
+    if(Interface->GetIID()->Equals(NSID_IDISPATCH))
+        identity = Object;
+    else
+#endif
+        identity = do_QueryInterface(Object);
+
+    if(!identity)
+    {
+        NS_ERROR("This XPCOM object fails in QueryInterface to nsISupports!");
+        return NS_ERROR_FAILURE;
+    }
 
     XPCWrappedNative* wrapper;
-    nsWrapperCache* cache;
+    Native2WrappedNativeMap* map = Scope->GetWrappedNativeMap();
-    Object->QueryInterface(NS_GET_IID(nsWrapperCache), (void**)&cache);
+
-    if(cache)
+    {   // scoped lock
-    {
+        XPCAutoLock lock(Scope->GetRuntime()->GetMapLock());
-        wrapper = static_cast<XPCWrappedNative*>(cache->GetWrapper());
+        wrapper = map->Find(identity);
         if(!wrapper)
         {
             *resultWrapper = nsnull;
@@ -604,36 +617,6 @@ XPCWrappedNative::GetUsedOnly(XPCCallContext& ccx,
         }
         NS_ADDREF(wrapper);
     }
-    else
-    {
-        nsCOMPtr<nsISupports> identity;
-#ifdef XPC_IDISPATCH_SUPPORT
-        // XXX See GetNewOrUsed for more info on this
-        if(Interface->GetIID()->Equals(NSID_IDISPATCH))
-            identity = Object;
-        else
-#endif
-            identity = do_QueryInterface(Object);
-
-        if(!identity)
-        {
-            NS_ERROR("This XPCOM object fails in QueryInterface to nsISupports!");
-            return NS_ERROR_FAILURE;
-        }
-
-        Native2WrappedNativeMap* map = Scope->GetWrappedNativeMap();
-
-        {   // scoped lock
-            XPCAutoLock lock(Scope->GetRuntime()->GetMapLock());
-            wrapper = map->Find(identity);
-            if(!wrapper)
-            {
-                *resultWrapper = nsnull;
-                return NS_OK;
-            }
-            NS_ADDREF(wrapper);
-        }
-    }
 
     nsresult rv;
     if(!wrapper->FindTearOff(ccx, Interface, JS_FALSE, &rv))

netwerk/protocol/file/src/nsFileProtocolHandler.cpp

@@ -51,8 +51,13 @@
 
 // URL file handling, copied and modified from xpfe/components/bookmarks/src/nsBookmarksService.cpp
 #ifdef XP_WIN
+#ifndef WINCE
+// Windows mobile does not support internet shortcuts including
+// CLSID_InternetShortcut and IUniformResourceLocator used in
+// this file
 #include <shlobj.h>
 #include <intshcut.h>
+#endif
 #include "nsIFileURL.h"
 #ifdef CompareString
 #undef CompareString