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<nsIBox> 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<nsIBox> box = do_QueryInterface(aFrame, &rv);
diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp
index 56c17ff3565..4f4eed9c7d2 100644
Binary files a/mozilla/layout/macbuild/layout.mcp and b/mozilla/layout/macbuild/layout.mcp differ