From cd93ce4e9edf788f87a9327a31c8a7d6d86f96a3 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Fri, 1 Sep 2000 21:39:25 +0000 Subject: [PATCH] removing unused xul frames, nsTitledButton and nsToolbarItemFrame. r=hyatt. git-svn-id: svn://10.0.0.236/trunk@77925 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 23 ------------------ .../html/style/src/nsCSSFrameConstructor.cpp | 23 ------------------ mozilla/layout/macbuild/layout.mcp | Bin 138809 -> 138753 bytes 3 files changed, 46 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index fae6b207f0f..439bb7a5f1f 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -190,9 +190,6 @@ NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* nsresult NS_NewProgressMeterFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); -nsresult -NS_NewTitledButtonFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); - nsresult NS_NewImageBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); @@ -5691,18 +5688,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, } } // End of RESIZER CONSTRUCTION logic - - - - - // TITLED BUTTON CONSTRUCTION - else if (aTag == nsXULAtoms::titledbutton) { - - processChildren = PR_TRUE; - isReplaced = PR_TRUE; - rv = NS_NewTitledButtonFrame(aPresShell, &newFrame); - } - // End of TITLED BUTTON CONSTRUCTION logic else if (aTag == nsXULAtoms::image) { processChildren = PR_TRUE; isReplaced = PR_TRUE; @@ -5713,7 +5698,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, isReplaced = PR_TRUE; rv = NS_NewSpringFrame(aPresShell, &newFrame); } - // End of TITLED BUTTON CONSTRUCTION logic // TEXT CONSTRUCTION else if (aTag == nsXULAtoms::text) { @@ -5964,12 +5948,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, } // End of TREE CONSTRUCTION code here (there's more later on in the function) - else if (aTag == nsXULAtoms::toolbaritem) { - processChildren = PR_TRUE; - rv = NS_NewToolbarItemFrame(aPresShell, &newFrame); - } - // End of TOOLBAR CONSTRUCTION logic - // PROGRESS METER CONSTRUCTION else if (aTag == nsXULAtoms::progressbar) { processChildren = PR_TRUE; @@ -9562,7 +9540,6 @@ nsCSSFrameConstructor::StyleChangeReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIAtom* aAttribute) { - // Is it a box? If so we can coelesce. nsresult rv; nsCOMPtr box = do_QueryInterface(aFrame, &rv); diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index fae6b207f0f..439bb7a5f1f 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -190,9 +190,6 @@ NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* nsresult NS_NewProgressMeterFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); -nsresult -NS_NewTitledButtonFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); - nsresult NS_NewImageBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); @@ -5691,18 +5688,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, } } // End of RESIZER CONSTRUCTION logic - - - - - // TITLED BUTTON CONSTRUCTION - else if (aTag == nsXULAtoms::titledbutton) { - - processChildren = PR_TRUE; - isReplaced = PR_TRUE; - rv = NS_NewTitledButtonFrame(aPresShell, &newFrame); - } - // End of TITLED BUTTON CONSTRUCTION logic else if (aTag == nsXULAtoms::image) { processChildren = PR_TRUE; isReplaced = PR_TRUE; @@ -5713,7 +5698,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, isReplaced = PR_TRUE; rv = NS_NewSpringFrame(aPresShell, &newFrame); } - // End of TITLED BUTTON CONSTRUCTION logic // TEXT CONSTRUCTION else if (aTag == nsXULAtoms::text) { @@ -5964,12 +5948,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, } // End of TREE CONSTRUCTION code here (there's more later on in the function) - else if (aTag == nsXULAtoms::toolbaritem) { - processChildren = PR_TRUE; - rv = NS_NewToolbarItemFrame(aPresShell, &newFrame); - } - // End of TOOLBAR CONSTRUCTION logic - // PROGRESS METER CONSTRUCTION else if (aTag == nsXULAtoms::progressbar) { processChildren = PR_TRUE; @@ -9562,7 +9540,6 @@ nsCSSFrameConstructor::StyleChangeReflow(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIAtom* aAttribute) { - // Is it a box? If so we can coelesce. nsresult rv; nsCOMPtr box = do_QueryInterface(aFrame, &rv); diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp index 56c17ff356587a5036c0e04179c28ef77c243f52..4f4eed9c7d272add01eb0cb560c4613e8b346068 100644 GIT binary patch delta 570 zcmdnFhof;1he&dMehvcz12Y2yqXq+$;767?}BhY!Kgw70730VCLDpgmG2^n^^@& z|3t^>lW!;Sv0p7zV_@Jn-25S_oR$4*!5IbywfxP7wZ9lAXJm;(1WHYT0zVn22S_vW zZSKw4)*;}TS6ot5nwy$el30?NpXW2(P?%9}^M$-<#?5EGxp*@Enl9+TIGa&>`&tJ^ zBW5;6cAzWRrfa(~>N9doPX|)dU0fJrroVGz6rbo^zunB0v00mm*?9Z*0>%XH?b0=j zUsV~cwhJy|tY>6AzkT6i#)FLZ22~G$-T(my=9G613=BNKmz|#wC%ReilGwMVH}PF} zja;k2@{6_>A1iasXKexU76Y-se<0XCaVev4Kt6;*1BTYl<>yvkC&EanJThQKrL;jAy6IiUVcl TPB#^2(q~Nt%Vdf(U0?$MXS}1+ delta 648 zcmbVK-%Ha`6u+PQ-8F~wg>PFE8}@5R!i@1%o7n;try(piG!Y?M7()%45*zcOi0Gx4 z9>&NU(_XS9iXP-EUIcr{q$i_61VRtJ1~JfwidMGHclsA};KMne&pqcJ&bjyQTJ`E$ zwfoxC)Ffj}V+@UqA2JztjV!rq;cFqWld<3oV`uFI;+UnNwOlU$B~O;?M|-_Vy6GV1 zVA?@DCNvA;f@w9@Q{=B^FFekD9@P(gba|;ZX>E^Y1d$`<^5UXp-Yy|Ge!bQf=#Cd8 z{DO>mp<53oSMJLd54=_(nS{0ZBix5S(&)q-PODd)Xx4OAqDH@|qmxiAi`_USlQR@0 zd(kMvVO$n|I%$$$((s&wJwq$u3?WEpBhYYYC!8aMvRxx8*n@k1^?DjtYO*nh^4`Mt z2Ao&M6WoE3?(K{82*y9``@G67;0*#3W8*2lwCt_wAJm&(ZpUK-(O7)AuRk0ejt_PZ zL?e+)QSr!ZsY+Z-q;5{A>@$SwMTRjxC%Y7UYI7Z5H8D@Z`kt`-4sE(}eZme$Mq&$N zm{*A{EF2Z-N|~{U<4XL*H%;U#Wfh@VLP(!=@&;M#fbW0zrG|8_X-LZvd6g0|?`P$v%ax2W4?EKt}_w?D(4ap!xv>)`?Mu##%l H@