Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checking in for nis@sparc.spb.su, fix for Java applets inserted as <OBJECT> run in spite of Java is turned off in Preferences bug 116888 r=peterl sr=beard

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@113445 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2002-02-01 21:40:49 +00:00
parent bcc31f85dd
commit ca86fbd4ee
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -3223,6 +3223,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
nsCOMPtr<nsIPluginTagInfo2> pti2;
nsPluginTagType tagType;
PRBool isJavaEnabled = PR_TRUE;
PRBool isJava = PR_FALSE;
rv = aOwner->QueryInterface(kIPluginTagInfo2IID, getter_AddRefs(pti2));
@@ -3239,7 +3240,10 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
return rv;
}
if (tagType == nsPluginTagType_Applet) {
if (tagType == nsPluginTagType_Applet ||
PL_strncasecmp(aMimeType, "application/x-java-vm", 21) == 0 ||
PL_strncasecmp(aMimeType, "application/x-java-applet", 25) == 0) {
isJava = PR_TRUE;
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID));
// see if java is enabled
if (prefs) {
@@ -3266,7 +3270,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
("nsPluginHostImpl::InstatiateEmbededPlugin FoundStopped mime=%s\n", aMimeType));
aOwner->GetInstance(instance);
if(!aMimeType || PL_strcasecmp(aMimeType, "application/x-java-vm"))
if(!aMimeType || !isJava)
rv = NewEmbededPluginStream(aURL, nsnull, instance);
// notify Java DOM component
@@ -3352,9 +3356,6 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
// create an initial stream with data
// don't make the stream if it's a java applet or we don't have SRC or DATA attribute
PRBool applet = (PL_strcasecmp(aMimeType, "application/x-java-vm") == 0 ||
PL_strcasecmp(aMimeType, "application/x-java-applet") == 0);
PRBool havedata = PR_FALSE;
nsCOMPtr<nsIPluginTagInfo> pti(do_QueryInterface(aOwner, &rv));
@@ -3367,7 +3368,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
havedata = NS_SUCCEEDED(pti->GetAttribute("DATA", &value));
}
if(havedata && !applet)
if(havedata && !isJava)
rv = NewEmbededPluginStream(aURL, nsnull, instance);
// notify Java DOM component