зеркало из https://github.com/mozilla/gecko-dev.git
changes for removal of zindex from nsIView::Init().
This commit is contained in:
Родитель
8963210ccb
Коммит
15de205f12
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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))) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче