diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 1a481aca3481..83e2ea11c441 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -249,7 +249,7 @@ nsFormControlFrame::Reflow(nsIPresContext&      aPresContext,
     nsWidgetInitData* initData = GetWidgetInitData(aPresContext); // needs to be deleted
 	  // initialize the view as hidden since we don't know the (x,y) until Paint
     result = view->Init(viewMan, boundBox, parView, &id, initData,
-                        nsnull, 0, nsnull,
+                        nsnull, nsnull,
                         1.0f, nsViewVisibility_kHide);
     if (nsnull != initData) {
       delete(initData);
diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index 22805ba4ca6c..70302f460a84 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -691,8 +691,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
 
   nsIViewManager* viewMan = presShell->GetViewManager();  
   NS_RELEASE(presShell);
-  rv = view->Init(viewMan, viewBounds,
-                  parView, &kCChildCID);
+  rv = view->Init(viewMan, viewBounds, parView, &kCChildCID);
   viewMan->InsertChild(parView, view, 0);
   NS_RELEASE(viewMan);
   SetView(view);
diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp
index 5004d4a05cc8..d3042e99abcf 100644
--- a/layout/generic/nsHTMLFrame.cpp
+++ b/layout/generic/nsHTMLFrame.cpp
@@ -264,6 +264,7 @@ RootContentFrame::RootContentFrame(nsIContent* aContent, nsIFrame* aParent)
     NS_ASSERTION(nsnull != viewManager, "null view manager");
 
     view->Init(viewManager, mRect, rootView);
+    //we don't insert it here, instead SetScrolledView() does it...
     NS_RELEASE(viewManager);
 
     // We expect the root view to be a scrolling view
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index d797a7842801..be4b01f32d19 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -245,7 +245,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth, nscoord aHeight, PRBool aViewOnly)
   //  nsWidgetInitData* initData = GetWidgetInitData(*aPresContext); // needs to be deleted
     // initialize the view as hidden since we don't know the (x,y) until Paint
     result = view->Init(viewMan, boundBox, parView, &kWidgetCID, nsnull,
-                        nsnull, 0, nsnull,
+                        nsnull, nsnull,
                         1.0f, nsViewVisibility_kHide);
   //  if (nsnull != initData) {
   //    delete(initData);
diff --git a/layout/html/base/src/nsBodyFrame.cpp b/layout/html/base/src/nsBodyFrame.cpp
index c4dc02676412..c1d276731c29 100644
--- a/layout/html/base/src/nsBodyFrame.cpp
+++ b/layout/html/base/src/nsBodyFrame.cpp
@@ -869,7 +869,7 @@ nsBodyFrame::CreateAbsoluteView(nsIStyleContext* aStyleContext) const
     // Initialize the view with a size of (0, 0). When we're done reflowing
     // the frame the view will be sized and positioned
     view->Init(viewManager, nsRect(0, 0, 0, 0), containingView, nsnull,
-               nsnull, nsnull, zIndex, pClip);
+               nsnull, nsnull, pClip);
     viewManager->InsertChild(containingView, view, zIndex);
     // If the background color is transparent then mark the view as having
     // transparent content.
diff --git a/layout/html/base/src/nsHTMLFrame.cpp b/layout/html/base/src/nsHTMLFrame.cpp
index 5004d4a05cc8..d3042e99abcf 100644
--- a/layout/html/base/src/nsHTMLFrame.cpp
+++ b/layout/html/base/src/nsHTMLFrame.cpp
@@ -264,6 +264,7 @@ RootContentFrame::RootContentFrame(nsIContent* aContent, nsIFrame* aParent)
     NS_ASSERTION(nsnull != viewManager, "null view manager");
 
     view->Init(viewManager, mRect, rootView);
+    //we don't insert it here, instead SetScrolledView() does it...
     NS_RELEASE(viewManager);
 
     // We expect the root view to be a scrolling view
diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp
index d797a7842801..be4b01f32d19 100644
--- a/layout/html/base/src/nsObjectFrame.cpp
+++ b/layout/html/base/src/nsObjectFrame.cpp
@@ -245,7 +245,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth, nscoord aHeight, PRBool aViewOnly)
   //  nsWidgetInitData* initData = GetWidgetInitData(*aPresContext); // needs to be deleted
     // initialize the view as hidden since we don't know the (x,y) until Paint
     result = view->Init(viewMan, boundBox, parView, &kWidgetCID, nsnull,
-                        nsnull, 0, nsnull,
+                        nsnull, nsnull,
                         1.0f, nsViewVisibility_kHide);
   //  if (nsnull != initData) {
   //    delete(initData);
diff --git a/layout/html/base/src/nsScrollFrame.cpp b/layout/html/base/src/nsScrollFrame.cpp
index dc9bbbafab10..8ef31b7830b9 100644
--- a/layout/html/base/src/nsScrollFrame.cpp
+++ b/layout/html/base/src/nsScrollFrame.cpp
@@ -166,7 +166,7 @@ nsScrollFrame::CreateScrollingView()
 
     // Initialize the scrolling view
     view->Init(viewManager, mRect, parentView, nsnull, nsnull, nsnull,
-               zIndex, nsnull, color->mOpacity);
+               nsnull, color->mOpacity);
 
     // Insert the view into the view hierarchy
     viewManager->InsertChild(parentView, view, zIndex);
@@ -198,7 +198,7 @@ nsScrollFrame::CreateScrollingView()
   
       // Initialize the view
       scrolledView->Init(viewManager, nsRect(0, 0, 0, 0), parentView, nsnull,
-                         nsnull, nsnull, 0, nsnull, color->mOpacity);
+                         nsnull, nsnull, nsnull, color->mOpacity);
   
       // If the background is transparent then inform the view manager
       if (isTransparent) {
diff --git a/layout/html/document/src/nsFrameFrame.cpp b/layout/html/document/src/nsFrameFrame.cpp
index 22805ba4ca6c..70302f460a84 100644
--- a/layout/html/document/src/nsFrameFrame.cpp
+++ b/layout/html/document/src/nsFrameFrame.cpp
@@ -691,8 +691,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
 
   nsIViewManager* viewMan = presShell->GetViewManager();  
   NS_RELEASE(presShell);
-  rv = view->Init(viewMan, viewBounds,
-                  parView, &kCChildCID);
+  rv = view->Init(viewMan, viewBounds, parView, &kCChildCID);
   viewMan->InsertChild(parView, view, 0);
   NS_RELEASE(viewMan);
   SetView(view);
diff --git a/layout/html/forms/src/nsFormControlFrame.cpp b/layout/html/forms/src/nsFormControlFrame.cpp
index 1a481aca3481..83e2ea11c441 100644
--- a/layout/html/forms/src/nsFormControlFrame.cpp
+++ b/layout/html/forms/src/nsFormControlFrame.cpp
@@ -249,7 +249,7 @@ nsFormControlFrame::Reflow(nsIPresContext&      aPresContext,
     nsWidgetInitData* initData = GetWidgetInitData(aPresContext); // needs to be deleted
 	  // initialize the view as hidden since we don't know the (x,y) until Paint
     result = view->Init(viewMan, boundBox, parView, &id, initData,
-                        nsnull, 0, nsnull,
+                        nsnull, nsnull,
                         1.0f, nsViewVisibility_kHide);
     if (nsnull != initData) {
       delete(initData);
diff --git a/webshell/src/nsDocumentViewer.cpp b/webshell/src/nsDocumentViewer.cpp
index a5af92fc751b..9838f29e9248 100644
--- a/webshell/src/nsDocumentViewer.cpp
+++ b/webshell/src/nsDocumentViewer.cpp
@@ -498,8 +498,8 @@ nsresult DocumentViewerImpl::MakeWindow(nsNativeWidget aNativeParent,
                                       (void **)&mView);
     static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID);
     if ((NS_OK != rv) || (NS_OK != mView->Init(mViewManager, 
-                                               tbounds, 
-                                               nsnull,
+                                               tbounds,
+                                               nsnull, 
                                                &kWidgetCID,
                                                nsnull,
                                                aNativeParent))) {