From b89d4b1ea8f182da2cccbf314a17e668f2f62b0b Mon Sep 17 00:00:00 2001 From: "sdv%sparc.spb.su" Date: Tue, 16 May 2000 00:22:30 +0000 Subject: [PATCH] sdv@sparc.spb.su added a hook to notify Java DOM component when a plugin is being instantiated r=idk@eng.sun.com git-svn-id: svn://10.0.0.236/trunk@69923 18797224-902f-48f8-a5cc-f745e15eee43 --- .../modules/plugin/base/src/nsPluginHostImpl.cpp | 13 +++++++++++++ mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index d1993e6e699..d25a8eea6aa 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1530,6 +1530,13 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, aOwner->GetInstance(instance); if(!aMimeType || PL_strcasecmp(aMimeType, "application/x-java-vm")) rv = NewEmbededPluginStream(aURL, nsnull, instance); + + // notify Java DOM component + nsresult res; + NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "component://netscape/blackwood/java-dom", &res); + if (NS_SUCCEEDED(res) && javaDOM) + javaDOM->SetInstance(instance); + NS_IF_RELEASE(instance); return NS_OK; } @@ -1581,6 +1588,12 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, PL_strcasecmp(aMimeType, "application/x-java-applet") != 0)) rv = NewEmbededPluginStream(aURL, nsnull, instance); + // notify Java DOM component + nsresult res; + NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "component://netscape/blackwood/java-dom", &res); + if (NS_SUCCEEDED(res) && javaDOM) + javaDOM->SetInstance(instance); + NS_RELEASE(instance); } } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index d1993e6e699..d25a8eea6aa 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -1530,6 +1530,13 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, aOwner->GetInstance(instance); if(!aMimeType || PL_strcasecmp(aMimeType, "application/x-java-vm")) rv = NewEmbededPluginStream(aURL, nsnull, instance); + + // notify Java DOM component + nsresult res; + NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "component://netscape/blackwood/java-dom", &res); + if (NS_SUCCEEDED(res) && javaDOM) + javaDOM->SetInstance(instance); + NS_IF_RELEASE(instance); return NS_OK; } @@ -1581,6 +1588,12 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, PL_strcasecmp(aMimeType, "application/x-java-applet") != 0)) rv = NewEmbededPluginStream(aURL, nsnull, instance); + // notify Java DOM component + nsresult res; + NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "component://netscape/blackwood/java-dom", &res); + if (NS_SUCCEEDED(res) && javaDOM) + javaDOM->SetInstance(instance); + NS_RELEASE(instance); } }