Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bulletproof to prevent crashing

Browse Source 
(asserts will still go off)
This commit is contained in:
alecf%netscape.com 1999-09-11 19:11:53 +00:00
parent 87957ce0af
commit 528f914113
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/base/nsCaret.cpp
View File

@ -487,6 +487,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void nsCaret::GetViewForRendering(nsIFrame *caretFrame, EViewCoordinates coordType, nsPoint &viewOffset, nsIView* &outView) void nsCaret::GetViewForRendering(nsIFrame *caretFrame, EViewCoordinates coordType, nsPoint &viewOffset, nsIView* &outView)
{ {
if (!caretFrame) return;
outView = nsnull; outView = nsnull;
nsIView* theView = nsnull; nsIView* theView = nsnull;
@ -586,7 +587,7 @@ void nsCaret::DrawCaret()
NS_ASSERTION(mLastCaretFrame != nsnull, "Should have a frame here"); NS_ASSERTION(mLastCaretFrame != nsnull, "Should have a frame here");
nsPoint viewOffset(0, 0); nsPoint viewOffset(0, 0);
nsIView *drawingView; nsIView *drawingView = nsnull;
GetViewForRendering(mLastCaretFrame, eViewCoordinates, viewOffset, drawingView); GetViewForRendering(mLastCaretFrame, eViewCoordinates, viewOffset, drawingView);
if (drawingView) if (drawingView)

3
layout/base/src/nsCaret.cpp
View File

@ -487,6 +487,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void nsCaret::GetViewForRendering(nsIFrame *caretFrame, EViewCoordinates coordType, nsPoint &viewOffset, nsIView* &outView) void nsCaret::GetViewForRendering(nsIFrame *caretFrame, EViewCoordinates coordType, nsPoint &viewOffset, nsIView* &outView)
{ {
if (!caretFrame) return;
outView = nsnull; outView = nsnull;
nsIView* theView = nsnull; nsIView* theView = nsnull;
@ -586,7 +587,7 @@ void nsCaret::DrawCaret()
NS_ASSERTION(mLastCaretFrame != nsnull, "Should have a frame here"); NS_ASSERTION(mLastCaretFrame != nsnull, "Should have a frame here");
nsPoint viewOffset(0, 0); nsPoint viewOffset(0, 0);
nsIView *drawingView; nsIView *drawingView = nsnull;
GetViewForRendering(mLastCaretFrame, eViewCoordinates, viewOffset, drawingView); GetViewForRendering(mLastCaretFrame, eViewCoordinates, viewOffset, drawingView);
if (drawingView) if (drawingView)