diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index d7c634a317e..bba7d92298e 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1546,6 +1546,8 @@ nsresult nsDocShell::CreateContentViewer(const char* aContentType, { NS_ENSURE_STATE(mCreated); + //XXX We should return NS_ERROR_FAILURE if we can't create a new + // one and then leave our window in tact.... //XXXQ Can we check the content type of the current content viewer // and reuse it without destroying it and re-creating it? diff --git a/mozilla/docshell/base/nsIDocShell.idl b/mozilla/docshell/base/nsIDocShell.idl index 2ac596ec0e4..c19cb180425 100644 --- a/mozilla/docshell/base/nsIDocShell.idl +++ b/mozilla/docshell/base/nsIDocShell.idl @@ -37,19 +37,6 @@ * The nsIDocShell */ - /* - {69E5DE00-7B8B-11d3-AF61-00A024FFC08C} - - {69E5DE99-7B8B-11d3-AF61-00A024FFC08C} have been reserved for DocShell - Interfaces. - - Currently Used: - {69E5DE00-7B8B-11d3-AF61-00A024FFC08C} - nsIDocShell - {69E5DE01-7B8B-11d3-AF61-00A024FFC08C} - nsIDocShellFile - {69E5DE02-7B8B-11d3-AF61-00A024FFC08C} - nsIDocShellEdit - {69E5DE03-7B8B-11d3-AF61-00A024FFC08C} - nsIHTMLDocShell - {69E5DE04-7B8B-11d3-AF61-00A024FFC08C} - nsIDocShellContainer - */ - [ptr] native nsIPresContext(nsIPresContext); [ptr] native nsIDocumentLoaderObserver(nsIDocumentLoaderObserver); [ptr] native nsIContentViewer(nsIContentViewer);