Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing regression: Default plugin shows for ActiveX controls and hides Netscape plugin (users sent to PFS to fetch plugin for application/x-oleobject), bug 151074 r=bryner sr=jst

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2002-07-08 06:26:44 +00:00
parent 141a7cd3e1
commit 64fd02fac7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsObjectFrame.cpp
View File

@ -986,7 +986,6 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
nsCOMPtr<nsIURI> fullURL; nsCOMPtr<nsIURI> fullURL;
nsAutoString classid; nsAutoString classid;
PRInt32 nameSpaceID;
if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) { if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) {
nsAutoString codeBase; nsAutoString codeBase;
@ -1002,8 +1001,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
} }
// if we have a clsid, we're either an internal widget, an ActiveX control, or an applet // if we have a clsid, we're either an internal widget, an ActiveX control, or an applet
mContent->GetNameSpaceID(nameSpaceID); if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::classid, classid)) {
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(nameSpaceID, nsHTMLAtoms::classid, classid)) {
PRBool bJavaObject; PRBool bJavaObject;
bJavaObject = !nsCRT::strncmp(classid.get(), NS_LITERAL_STRING("java:").get(), 5); bJavaObject = !nsCRT::strncmp(classid.get(), NS_LITERAL_STRING("java:").get(), 5);

4
layout/html/base/src/nsObjectFrame.cpp
View File

@ -986,7 +986,6 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
nsCOMPtr<nsIURI> fullURL; nsCOMPtr<nsIURI> fullURL;
nsAutoString classid; nsAutoString classid;
PRInt32 nameSpaceID;
if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) { if (NS_SUCCEEDED(rv = GetBaseURL(*getter_AddRefs(baseURL)))) {
nsAutoString codeBase; nsAutoString codeBase;
@ -1002,8 +1001,7 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
} }
// if we have a clsid, we're either an internal widget, an ActiveX control, or an applet // if we have a clsid, we're either an internal widget, an ActiveX control, or an applet
mContent->GetNameSpaceID(nameSpaceID); if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::classid, classid)) {
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(nameSpaceID, nsHTMLAtoms::classid, classid)) {
PRBool bJavaObject; PRBool bJavaObject;
bJavaObject = !nsCRT::strncmp(classid.get(), NS_LITERAL_STRING("java:").get(), 5); bJavaObject = !nsCRT::strncmp(classid.get(), NS_LITERAL_STRING("java:").get(), 5);