Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-06 00:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing busted Mac plugins due to my checkin earlier today, bug 114716 r=av sr=beard

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2001-12-12 04:15:12 +00:00
parent 8861c70ad5
commit 9204d22bf9
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsObjectFrame.cpp
View File

@ -2759,8 +2759,13 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
nsCOMPtr<nsIContent> content;
nsresult rv = mOwner->GetContent(getter_AddRefs(content));
NS_ENSURE_TRUE(content, rv);
rv = content->GetAttrCount((PRInt32&)mNumCachedAttrs); // signed 32 bits to unsigned 16 bits conversion
PRInt32 cattrs;
rv = content->GetAttrCount(cattrs);
NS_ENSURE_SUCCESS(rv, rv);
if (cattrs < 0xFFFF)
mNumCachedAttrs = NS_STATIC_CAST(PRUint16, cattrs); // signed 32 bits to unsigned 16 bits conversion
else
mNumCachedParams = 0x0000FFFF;
// now, we need to find all the PARAM tags that are children of us
// however, be carefull NOT to include any PARAMs that don't have us as a direct
@ -2825,8 +2830,12 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
}
}
}
ourParams->Count((PRUint32*)&mNumCachedParams); // unsigned 32 bits to unsigned 16 bits conversion
PRUint32 cparams;
ourParams->Count(&cparams); // unsigned 32 bits to unsigned 16 bits conversion
if (cparams < 0xFFFF)
mNumCachedParams = NS_STATIC_CAST(PRUint16, cparams);
else
mNumCachedParams = 0x0000FFFF;
// now lets make the arrays

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

@ -2759,8 +2759,13 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
nsCOMPtr<nsIContent> content;
nsresult rv = mOwner->GetContent(getter_AddRefs(content));
NS_ENSURE_TRUE(content, rv);
rv = content->GetAttrCount((PRInt32&)mNumCachedAttrs); // signed 32 bits to unsigned 16 bits conversion
PRInt32 cattrs;
rv = content->GetAttrCount(cattrs);
NS_ENSURE_SUCCESS(rv, rv);
if (cattrs < 0xFFFF)
mNumCachedAttrs = NS_STATIC_CAST(PRUint16, cattrs); // signed 32 bits to unsigned 16 bits conversion
else
mNumCachedParams = 0x0000FFFF;
// now, we need to find all the PARAM tags that are children of us
// however, be carefull NOT to include any PARAMs that don't have us as a direct
@ -2825,8 +2830,12 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
}
}
}
ourParams->Count((PRUint32*)&mNumCachedParams); // unsigned 32 bits to unsigned 16 bits conversion
PRUint32 cparams;
ourParams->Count(&cparams); // unsigned 32 bits to unsigned 16 bits conversion
if (cparams < 0xFFFF)
mNumCachedParams = NS_STATIC_CAST(PRUint16, cparams);
else
mNumCachedParams = 0x0000FFFF;
// now lets make the arrays