From d2ecbb2bef3d5351b7e42bdd13fe512ddf99a7aa Mon Sep 17 00:00:00 2001 From: "amusil%netscape.com" Date: Thu, 11 Mar 1999 22:50:58 +0000 Subject: [PATCH] Minor API change. Added support for tags that don't specify SRC or DATA params. git-svn-id: svn://10.0.0.236/trunk@23783 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 10 +++++++--- mozilla/layout/html/base/src/nsObjectFrame.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 33d5014bd04..4ceaace5491 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -661,10 +661,14 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, SetFullURL(fullURL); NS_IF_RELEASE(group); - } + } } - nsIView *parentWithView; + // if there's no fullURL at this point, we need to set one + if(!fullURL && baseURL) + SetFullURL(baseURL); + + nsIView *parentWithView; nsPoint origin; // we need to recalculate this now that we have access to the nsPluginInstanceOwner @@ -693,7 +697,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, #ifdef XP_UNIX window->ws_info = nsnull; //XXX need to figure out what this is. MMP #endif - rv = pm->InstantiateEmbededPlugin(buf, src, mInstanceOwner); + rv = pm->InstantiateEmbededPlugin(buf, fullURL, mInstanceOwner); NS_IF_RELEASE(fullURL); NS_IF_RELEASE(baseURL); diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 33d5014bd04..4ceaace5491 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -661,10 +661,14 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, SetFullURL(fullURL); NS_IF_RELEASE(group); - } + } } - nsIView *parentWithView; + // if there's no fullURL at this point, we need to set one + if(!fullURL && baseURL) + SetFullURL(baseURL); + + nsIView *parentWithView; nsPoint origin; // we need to recalculate this now that we have access to the nsPluginInstanceOwner @@ -693,7 +697,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, #ifdef XP_UNIX window->ws_info = nsnull; //XXX need to figure out what this is. MMP #endif - rv = pm->InstantiateEmbededPlugin(buf, src, mInstanceOwner); + rv = pm->InstantiateEmbededPlugin(buf, fullURL, mInstanceOwner); NS_IF_RELEASE(fullURL); NS_IF_RELEASE(baseURL);