Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-16 11:45:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

plugin changes.

Browse Source
This commit is contained in:
michaelp%netscape.com 1998-08-01 05:47:53 +00:00
parent f51ff39ac4
commit ef12e2e29f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/generic/nsObjectFrame.cpp
View File

@ -108,7 +108,8 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext,
// delete(initData);
// }
if (NS_OK != result) {
return NS_OK;
result = NS_OK; //XXX why OK? MMP
goto exit; //XXX sue me. MMP
}
#if 0
@ -127,11 +128,14 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext,
viewMan->InsertChild(parView, view, 0);
SetView(view);
exit:
NS_RELEASE(view);
NS_IF_RELEASE(parView);
NS_IF_RELEASE(viewMan);
NS_IF_RELEASE(presShell);
return result;
}
@ -208,7 +212,8 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID);
static NS_DEFINE_IID(kIContentViewerContainerIID, NS_ICONTENT_VIEWER_CONTAINER_IID);
nsISupports *container, *pluginsup;
nsISupports *container;
nsIPluginInstance *pluginsup;
nsIPluginHost *pm;
nsIContentViewerContainer *cv;
@ -221,9 +226,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
rv = cv->QueryCapability(kIPluginHostIID, (void **)&pm);
if (NS_OK == rv) {
nsString type;
char *buf;
PRInt32 buflen;
nsAutoString type;
char *buf;
PRInt32 buflen;
mContent->GetAttribute(nsString("type"), type);
@ -238,6 +243,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
rv = pm->InstantiatePlugin(buf, &pluginsup);
if (NS_OK == rv) {
pluginsup->Start();
}
}
}

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

@ -108,7 +108,8 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext,
// delete(initData);
// }
if (NS_OK != result) {
return NS_OK;
result = NS_OK; //XXX why OK? MMP
goto exit; //XXX sue me. MMP
}
#if 0
@ -127,11 +128,14 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext,
viewMan->InsertChild(parView, view, 0);
SetView(view);
exit:
NS_RELEASE(view);
NS_IF_RELEASE(parView);
NS_IF_RELEASE(viewMan);
NS_IF_RELEASE(presShell);
return result;
}
@ -208,7 +212,8 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID);
static NS_DEFINE_IID(kIContentViewerContainerIID, NS_ICONTENT_VIEWER_CONTAINER_IID);
nsISupports *container, *pluginsup;
nsISupports *container;
nsIPluginInstance *pluginsup;
nsIPluginHost *pm;
nsIContentViewerContainer *cv;
@ -221,9 +226,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
rv = cv->QueryCapability(kIPluginHostIID, (void **)&pm);
if (NS_OK == rv) {
nsString type;
char *buf;
PRInt32 buflen;
nsAutoString type;
char *buf;
PRInt32 buflen;
mContent->GetAttribute(nsString("type"), type);
@ -238,6 +243,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
rv = pm->InstantiatePlugin(buf, &pluginsup);
if (NS_OK == rv) {
pluginsup->Start();
}
}
}