From 90b7e7dc881c66a3eff91f25167a3ede1313e590 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Thu, 3 Jun 1999 04:34:49 +0000 Subject: [PATCH] bug 1252, check for null view git-svn-id: svn://10.0.0.236/trunk@33501 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameFrame.cpp | 18 ++++++++++-------- .../layout/html/document/src/nsFrameFrame.cpp | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 5a9611d356a..6ad66d75a2c 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -711,14 +711,16 @@ nsHTMLFrameInnerFrame::DidReflow(nsIPresContext& aPresContext, if (NS_FRAME_REFLOW_FINISHED == aStatus) { nsIView* view = nsnull; GetView(&view); - const nsStyleDisplay* display; - GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_HIDDEN == display->mVisible ? nsViewVisibility_kHide : nsViewVisibility_kShow; - nsViewVisibility oldVis; - // only change if different. - view->GetVisibility(oldVis); - if (newVis != oldVis) - view->SetVisibility(newVis); + if (view) { + const nsStyleDisplay* display; + GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); + nsViewVisibility newVis = NS_STYLE_VISIBILITY_HIDDEN == display->mVisible ? nsViewVisibility_kHide : nsViewVisibility_kShow; + nsViewVisibility oldVis; + // only change if different. + view->GetVisibility(oldVis); + if (newVis != oldVis) + view->SetVisibility(newVis); + } } return rv; diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 5a9611d356a..6ad66d75a2c 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -711,14 +711,16 @@ nsHTMLFrameInnerFrame::DidReflow(nsIPresContext& aPresContext, if (NS_FRAME_REFLOW_FINISHED == aStatus) { nsIView* view = nsnull; GetView(&view); - const nsStyleDisplay* display; - GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_HIDDEN == display->mVisible ? nsViewVisibility_kHide : nsViewVisibility_kShow; - nsViewVisibility oldVis; - // only change if different. - view->GetVisibility(oldVis); - if (newVis != oldVis) - view->SetVisibility(newVis); + if (view) { + const nsStyleDisplay* display; + GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); + nsViewVisibility newVis = NS_STYLE_VISIBILITY_HIDDEN == display->mVisible ? nsViewVisibility_kHide : nsViewVisibility_kShow; + nsViewVisibility oldVis; + // only change if different. + view->GetVisibility(oldVis); + if (newVis != oldVis) + view->SetVisibility(newVis); + } } return rv;