r=rpotts, r=heikki, sr=vidur. content types are no longer hardcoded for docshell load acceptance. we now ask layout what it can handle (indirectly via the category manager). 40772.

git-svn-id: svn://10.0.0.236/trunk@92456 18797224-902f-48f8-a5cc-f745e15eee43
2001-04-16 23:05:08 +00:00
parent 29ad9f24ed
commit 7037da5301
4 changed files with 51 additions and 77 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -4407,6 +4407,7 @@ NS_IMETHODIMP nsDocShell::GetRootScrollableView(nsIScrollableView** aOutScrollVi

 NS_IMETHODIMP nsDocShell::EnsureContentListener()
 {
+   nsresult rv = NS_OK;
   if(mContentListener)
      return NS_OK;
   
@@ -4414,6 +4415,10 @@ NS_IMETHODIMP nsDocShell::EnsureContentListener()
   NS_ENSURE_TRUE(mContentListener, NS_ERROR_OUT_OF_MEMORY);

   NS_ADDREF(mContentListener);
+
+   rv = mContentListener->Init();
+   if (NS_FAILED(rv)) return rv;
+
   mContentListener->DocShell(this);

   return NS_OK;