From d503a47c59e6232faacf596213af01faf20af66e Mon Sep 17 00:00:00 2001 From: "anthonyd%netscape.com" Date: Thu, 3 Aug 2000 22:30:47 +0000 Subject: [PATCH] nsPresContext.cpp : added to comment to presContext::GetLookAndFeel to inform others that that method has been depricated. nsTextFrame.cpp : changed an assert to a warning, didnt need to be an assert. r: mjudge@netscape.com git-svn-id: svn://10.0.0.236/trunk@75532 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresContext.cpp | 5 ++++- mozilla/layout/base/src/nsPresContext.cpp | 5 ++++- mozilla/layout/generic/nsTextFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsTextFrame.cpp | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index 4345b30c3a7..8ad9a0e0464 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -448,7 +448,10 @@ nsPresContext::SetImageAnimationMode(nsImageAnimation aMode) return NS_OK; } - +/* This function has now been depricated. It is no longer necesary to + * hold on to presContext just to get a nsLookAndFeel. nsLookAndFeel is + * now a service provided by ServiceManager. + */ NS_IMETHODIMP nsPresContext::GetLookAndFeel(nsILookAndFeel** aLookAndFeel) { diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index 4345b30c3a7..8ad9a0e0464 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -448,7 +448,10 @@ nsPresContext::SetImageAnimationMode(nsImageAnimation aMode) return NS_OK; } - +/* This function has now been depricated. It is no longer necesary to + * hold on to presContext just to get a nsLookAndFeel. nsLookAndFeel is + * now a service provided by ServiceManager. + */ NS_IMETHODIMP nsPresContext::GetLookAndFeel(nsILookAndFeel** aLookAndFeel) { diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 719d1b09319..94140fe9e33 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -1307,7 +1307,8 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX, } } n -= contentLen; - NS_ASSERTION(n >= 0, "whoops"); + if(n<0) + NS_WARNING("mContentLength is < FragmentLength"); } } diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 719d1b09319..94140fe9e33 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -1307,7 +1307,8 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX, } } n -= contentLen; - NS_ASSERTION(n >= 0, "whoops"); + if(n<0) + NS_WARNING("mContentLength is < FragmentLength"); } }