Backing out bug 253888 until I can figure out how to fix the crash

git-svn-id: svn://10.0.0.236/trunk@161097 18797224-902f-48f8-a5cc-f745e15eee43
2004-08-21 06:27:54 +00:00
parent e49f4fa38e
commit 03c6a8279c
50 changed files with 943 additions and 1229 deletions
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -240,7 +240,10 @@ nsSubDocumentFrame::Init(nsPresContext* aPresContext,
    nsCOMPtr<nsIAtom> contentParentAtom = do_GetAtom("contentParent");
    nsIFrame* contentParent = nsnull;

-    void *value = UnsetProperty(contentParentAtom, &rv);
+    void *value =
+      aPresContext->FrameManager()->GetFrameProperty(this, contentParentAtom,
+                                                     NS_IFRAME_MGR_REMOVE_PROP,
+                                                     &rv);
    if (NS_SUCCEEDED(rv)) {
          contentParent = (nsIFrame*)value;
    }