From 24e8e9d5cd22a14ead544c30531c5f57e1e29365 Mon Sep 17 00:00:00 2001
From: "pierre%netscape.com"
 <pierre%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 5 Jan 1999 03:48:54 +0000
Subject: [PATCH] Fixing the xpfeViewer build (which is now obsolete) just for
 the sake of it

git-svn-id: svn://10.0.0.236/trunk@17134 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/macbuild/xpfeviewer.mcp          | Bin 166139 -> 166139 bytes
 mozilla/xpfe/xpviewer/src/nsBrowserWindow.cpp |   8 +++++---
 mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp |   4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mozilla/xpfe/macbuild/xpfeviewer.mcp b/mozilla/xpfe/macbuild/xpfeviewer.mcp
index bb284a2d752286adb538bd686a5fa75e7d86f7d6..520c8e4dfb8525c886a3834a286d0fccc38acf52 100644
GIT binary patch
delta 452
zcmZ{c-77<J9EZ>Mx1F86SZ1@(j+ZdbS~F4OLNo1#i+R6LE;O7_np&*Tgh(O9SDjK`
zBTFu(pLR--3m4+XjVphF#I;Drk6XETJ{QlYp3imj=ejvP2Uah~aUsHnaNxi-@Pe0K
zK(`L2u$J$~Bwt|4VVC{qrpQ}#Lgv1O<A!?Zkui^e4KK}M%(nz-&@y9!N(^q*nTl9W
zWEA38t_ww{v?1zE)lB?CBhE(<GPfR0+lj0D1U>-E3i5=^U9qO!eEk>=FyyKS&)=HW
z%`z2?N`{0Ur)xtrVzbkRL3b7{5seO*#E5?Yt*LUF_NT`|!06#I9X%Q&j?K1%tKNsb
z^VfSwy|0G**G|rG`MAU1DG$ga3As5M8-&Pny1iXkM0=o19uE&k<4y5+bh1+(8X1d`
zmF=RyM2wnK;-d2A14+$P!L?3ltpVxZ;d3|+42stWr3CECt`8~<;9$=9>(q%FIMXX{
sb*vU>1c_ftG=Q3DAo?aaRi=}q4?^lwl4t}@)u&mKO<+NNnI|^GH=4zUD*ylh

delta 627
zcmY+APiWIn9LL}9rCHO|u7$32!yW={C)(AxGMI<qrc?1BC~k<Jq;8o+y6#_^HceBe
zAbJwFhXlmqMDbL3hkzgmf(K8#?>+`zJbAE4{AJC>!}oo^`R4udd3pUExxXX#o<d@Z
z5Hd$`p#)Ow6_j9#e}+Y&*uc_6HBl{;g=(X0R0rjtx-2O^;%~&55Pf;$x9=Zr@%K`e
zLYjS%=hJry;CBfukl|xrB$V~#d44ax5`%N>!rKLw%1CgEWiqAR+z7v)`2o@G!%KuH
zula`m2UvbAi^Uy6CZ1s71DiW}9xDG$s=K)es}x7Ml9SSIHVqRDK8><#>Sf+jdj?3X
zy7%G1SbSCAT3TIe>$O@H4->n3{ni!yfoABf(5=wT(CyGWp*x{>LvQfEdu^(2G_;zf
z=*wE&5Z1r{sw$6lQ>!PGGm2g}w9S?3l6DrK)I`Ft*0p6Wf6P4>8+bJl*Dga|G%<?D
z5t^<)3FAYgg;jJ=S?=u$jJw4$oEB}Y<-t$~V|)-Dj3)-0yKZt83f|2!d=osg0=<Z6
z;9CSuBPd`Z2qTyQs31vr30NX3C|d!l;O3{HB(||eR4^7$5f#LMiYScU@GKk&FU%S6
i%o!TF2>Y(>(1-BVJ8-B^Vc$F0rb!C#yr0i#YUm#U>!3aW

diff --git a/mozilla/xpfe/xpviewer/src/nsBrowserWindow.cpp b/mozilla/xpfe/xpviewer/src/nsBrowserWindow.cpp
index 0a3ee8ed258..efde3462704 100644
--- a/mozilla/xpfe/xpviewer/src/nsBrowserWindow.cpp
+++ b/mozilla/xpfe/xpviewer/src/nsBrowserWindow.cpp
@@ -2883,7 +2883,8 @@ nsBrowserWindow::DumpFrames(FILE* out, nsString *aFilterName)
 {
   nsIPresShell* shell = GetPresShell();
   if (nsnull != shell) {
-    nsIFrame* root = shell->GetRootFrame();
+    nsIFrame* root;
+    shell->GetRootFrame(root);
     if (nsnull != root) {
       nsIListFilter *filter = nsIFrame::GetFilter(aFilterName);
       root->List(out, 0, filter);
@@ -2998,7 +2999,8 @@ nsBrowserWindow::DumpStyleContexts(FILE* out)
   if (nsnull == styleSet) {
     fputs("null style set\n", out);
   } else {
-    nsIFrame* root = shell->GetRootFrame();
+    nsIFrame* root;
+    shell->GetRootFrame(root);
     if (nsnull == root) {
     fputs("null root frame\n", out);
     } else {
@@ -3071,7 +3073,7 @@ nsBrowserWindow::ShowFrameSize()
       return;
       }
       nsIFrame* root;
-      root = shell->GetRootFrame();
+      shell->GetRootFrame(root);
       if (nsnull != root) {
       root->SizeOf(szh);
       PRUint32 totalSize;
diff --git a/mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp b/mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp
index df3a9b33433..61977c19aa7 100644
--- a/mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp
+++ b/mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp
@@ -130,7 +130,7 @@ static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID);
 static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID);
 static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID);
 static NS_DEFINE_IID(kCRangeCID, NS_RANGE_CID);
-static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID);
+static NS_DEFINE_IID(kCHTMLImageElement, NS_HTMLIMAGEELEMENT_CID);
 static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
 
 static NS_DEFINE_IID(kCImageButtonCID, NS_IMAGEBUTTON_CID);
@@ -188,7 +188,7 @@ NS_SetupRegistry()
   nsRepository::RegisterFactory(kCImageDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kCRangeListCID, LAYOUT_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kCRangeCID, LAYOUT_DLL, PR_FALSE, PR_FALSE);
-  nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterFactory(kCHTMLImageElement, LAYOUT_DLL, PR_FALSE, PR_FALSE);
 
   nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE);