From a069a1170c15b190f867c5f4439997976c797255 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Sat, 11 Mar 2000 01:25:34 +0000 Subject: [PATCH] ContentViewer Initialization now take an nsIWidget instead of a native window. Set status using the nsIWebBrowserChrome interface instead of the old nsIBrowserWindow interface. --- layout/base/src/nsPluginViewer.cpp | 41 ++++++++-------------- modules/plugin/base/src/nsPluginViewer.cpp | 41 ++++++++-------------- modules/plugin/nglsrc/nsPluginViewer.cpp | 41 ++++++++-------------- 3 files changed, 45 insertions(+), 78 deletions(-) diff --git a/layout/base/src/nsPluginViewer.cpp b/layout/base/src/nsPluginViewer.cpp index eb0a3d6c663b..a7129a0a9acf 100644 --- a/layout/base/src/nsPluginViewer.cpp +++ b/layout/base/src/nsPluginViewer.cpp @@ -35,11 +35,12 @@ #include "nsIWebShell.h" #include "nsIContentViewerEdit.h" #include "nsIContentViewerFile.h" -#include "nsIBrowserWindow.h" #include "nsIContent.h" #include "nsIDocument.h" #include "nsIInterfaceRequestor.h" #include "nsIDocShellTreeItem.h" +#include "nsIDocShellTreeOwner.h" +#include "nsIWebBrowserChrome.h" // Class IDs static NS_DEFINE_IID(kChildWindowCID, NS_CHILD_CID); @@ -53,7 +54,6 @@ static NS_DEFINE_IID(kIPluginInstanceOwnerIID, NS_IPLUGININSTANCEOWNER_IID); static NS_DEFINE_IID(kILinkHandlerIID, NS_ILINKHANDLER_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); -static NS_DEFINE_IID(kIBrowserWindowIID, NS_IBROWSER_WINDOW_IID); static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); @@ -127,10 +127,9 @@ public: NS_DECL_ISUPPORTS // nsIContentViewer - NS_IMETHOD Init(nsNativeWidget aParent, + NS_IMETHOD Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling = nsScrollPreference_kAuto); + const nsRect& aBounds); NS_IMETHOD BindToDocument(nsISupports* aDoc, const char* aCommand); NS_IMETHOD SetContainer(nsISupports* aContainer); NS_IMETHOD GetContainer(nsISupports** aContainerResult); @@ -284,12 +283,12 @@ PluginViewerImpl::GetContainer(nsISupports** aResult) NS_IMETHODIMP -PluginViewerImpl::Init(nsNativeWidget aNativeParent, +PluginViewerImpl::Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling) + const nsRect& aBounds) { - nsresult rv = MakeWindow(aNativeParent, aDeviceContext, aBounds); + nsresult rv = MakeWindow(aParentWidget->GetNativeData(NS_NATIVE_WIDGET), + aDeviceContext, aBounds); if (NS_OK == rv) { mOwner = new pluginInstanceOwner(); if (nsnull != mOwner) { @@ -837,27 +836,17 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if (docShellItem) { - nsCOMPtr root; + nsCOMPtr treeOwner; + docShellItem->GetTreeOwner(getter_AddRefs(treeOwner)); - docShellItem->GetSameTypeRootTreeItem(getter_AddRefs(root)); - - nsCOMPtr rootWebShell(do_QueryInterface(root)); - if (rootWebShell) + if(treeOwner) { - nsCOMPtr rootContainer; + nsCOMPtr browserChrome(do_GetInterface(treeOwner)); - rv = rootWebShell->GetContainer(*getter_AddRefs(rootContainer)); - - if (nsnull != rootContainer) + if(browserChrome) { - nsCOMPtr browserWindow(do_QueryInterface(rootContainer)); - - if (browserWindow) - { - nsAutoString msg = nsAutoString(aStatusMsg); - - rv = browserWindow->SetStatus(msg.GetUnicode()); - } + nsAutoString msg = nsAutoString(aStatusMsg); + browserChrome->SetJSStatus(msg.GetUnicode()); } } } diff --git a/modules/plugin/base/src/nsPluginViewer.cpp b/modules/plugin/base/src/nsPluginViewer.cpp index eb0a3d6c663b..a7129a0a9acf 100644 --- a/modules/plugin/base/src/nsPluginViewer.cpp +++ b/modules/plugin/base/src/nsPluginViewer.cpp @@ -35,11 +35,12 @@ #include "nsIWebShell.h" #include "nsIContentViewerEdit.h" #include "nsIContentViewerFile.h" -#include "nsIBrowserWindow.h" #include "nsIContent.h" #include "nsIDocument.h" #include "nsIInterfaceRequestor.h" #include "nsIDocShellTreeItem.h" +#include "nsIDocShellTreeOwner.h" +#include "nsIWebBrowserChrome.h" // Class IDs static NS_DEFINE_IID(kChildWindowCID, NS_CHILD_CID); @@ -53,7 +54,6 @@ static NS_DEFINE_IID(kIPluginInstanceOwnerIID, NS_IPLUGININSTANCEOWNER_IID); static NS_DEFINE_IID(kILinkHandlerIID, NS_ILINKHANDLER_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); -static NS_DEFINE_IID(kIBrowserWindowIID, NS_IBROWSER_WINDOW_IID); static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); @@ -127,10 +127,9 @@ public: NS_DECL_ISUPPORTS // nsIContentViewer - NS_IMETHOD Init(nsNativeWidget aParent, + NS_IMETHOD Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling = nsScrollPreference_kAuto); + const nsRect& aBounds); NS_IMETHOD BindToDocument(nsISupports* aDoc, const char* aCommand); NS_IMETHOD SetContainer(nsISupports* aContainer); NS_IMETHOD GetContainer(nsISupports** aContainerResult); @@ -284,12 +283,12 @@ PluginViewerImpl::GetContainer(nsISupports** aResult) NS_IMETHODIMP -PluginViewerImpl::Init(nsNativeWidget aNativeParent, +PluginViewerImpl::Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling) + const nsRect& aBounds) { - nsresult rv = MakeWindow(aNativeParent, aDeviceContext, aBounds); + nsresult rv = MakeWindow(aParentWidget->GetNativeData(NS_NATIVE_WIDGET), + aDeviceContext, aBounds); if (NS_OK == rv) { mOwner = new pluginInstanceOwner(); if (nsnull != mOwner) { @@ -837,27 +836,17 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if (docShellItem) { - nsCOMPtr root; + nsCOMPtr treeOwner; + docShellItem->GetTreeOwner(getter_AddRefs(treeOwner)); - docShellItem->GetSameTypeRootTreeItem(getter_AddRefs(root)); - - nsCOMPtr rootWebShell(do_QueryInterface(root)); - if (rootWebShell) + if(treeOwner) { - nsCOMPtr rootContainer; + nsCOMPtr browserChrome(do_GetInterface(treeOwner)); - rv = rootWebShell->GetContainer(*getter_AddRefs(rootContainer)); - - if (nsnull != rootContainer) + if(browserChrome) { - nsCOMPtr browserWindow(do_QueryInterface(rootContainer)); - - if (browserWindow) - { - nsAutoString msg = nsAutoString(aStatusMsg); - - rv = browserWindow->SetStatus(msg.GetUnicode()); - } + nsAutoString msg = nsAutoString(aStatusMsg); + browserChrome->SetJSStatus(msg.GetUnicode()); } } } diff --git a/modules/plugin/nglsrc/nsPluginViewer.cpp b/modules/plugin/nglsrc/nsPluginViewer.cpp index eb0a3d6c663b..a7129a0a9acf 100644 --- a/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -35,11 +35,12 @@ #include "nsIWebShell.h" #include "nsIContentViewerEdit.h" #include "nsIContentViewerFile.h" -#include "nsIBrowserWindow.h" #include "nsIContent.h" #include "nsIDocument.h" #include "nsIInterfaceRequestor.h" #include "nsIDocShellTreeItem.h" +#include "nsIDocShellTreeOwner.h" +#include "nsIWebBrowserChrome.h" // Class IDs static NS_DEFINE_IID(kChildWindowCID, NS_CHILD_CID); @@ -53,7 +54,6 @@ static NS_DEFINE_IID(kIPluginInstanceOwnerIID, NS_IPLUGININSTANCEOWNER_IID); static NS_DEFINE_IID(kILinkHandlerIID, NS_ILINKHANDLER_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); -static NS_DEFINE_IID(kIBrowserWindowIID, NS_IBROWSER_WINDOW_IID); static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); @@ -127,10 +127,9 @@ public: NS_DECL_ISUPPORTS // nsIContentViewer - NS_IMETHOD Init(nsNativeWidget aParent, + NS_IMETHOD Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling = nsScrollPreference_kAuto); + const nsRect& aBounds); NS_IMETHOD BindToDocument(nsISupports* aDoc, const char* aCommand); NS_IMETHOD SetContainer(nsISupports* aContainer); NS_IMETHOD GetContainer(nsISupports** aContainerResult); @@ -284,12 +283,12 @@ PluginViewerImpl::GetContainer(nsISupports** aResult) NS_IMETHODIMP -PluginViewerImpl::Init(nsNativeWidget aNativeParent, +PluginViewerImpl::Init(nsIWidget* aParentWidget, nsIDeviceContext* aDeviceContext, - const nsRect& aBounds, - nsScrollPreference aScrolling) + const nsRect& aBounds) { - nsresult rv = MakeWindow(aNativeParent, aDeviceContext, aBounds); + nsresult rv = MakeWindow(aParentWidget->GetNativeData(NS_NATIVE_WIDGET), + aDeviceContext, aBounds); if (NS_OK == rv) { mOwner = new pluginInstanceOwner(); if (nsnull != mOwner) { @@ -837,27 +836,17 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if (docShellItem) { - nsCOMPtr root; + nsCOMPtr treeOwner; + docShellItem->GetTreeOwner(getter_AddRefs(treeOwner)); - docShellItem->GetSameTypeRootTreeItem(getter_AddRefs(root)); - - nsCOMPtr rootWebShell(do_QueryInterface(root)); - if (rootWebShell) + if(treeOwner) { - nsCOMPtr rootContainer; + nsCOMPtr browserChrome(do_GetInterface(treeOwner)); - rv = rootWebShell->GetContainer(*getter_AddRefs(rootContainer)); - - if (nsnull != rootContainer) + if(browserChrome) { - nsCOMPtr browserWindow(do_QueryInterface(rootContainer)); - - if (browserWindow) - { - nsAutoString msg = nsAutoString(aStatusMsg); - - rv = browserWindow->SetStatus(msg.GetUnicode()); - } + nsAutoString msg = nsAutoString(aStatusMsg); + browserChrome->SetJSStatus(msg.GetUnicode()); } } }