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

Bug 292348 NewEmbededPluginStream misspelled

Browse Source 
patch by pythonesque+bugzilla@gmail.com r=jst sr=jst a=asa


git-svn-id: svn://10.0.0.236/trunk@174323 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2005-06-08 23:42:15 +00:00
parent 527e66b47a
commit b048e1083d
10 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/editor/ui/composer/content/publishprefs.js
View File

@@ -785,7 +785,7 @@ function SetPublishStringPref(prefBranch, name, value)
// Assure that a publishing URL ends in "/", "=", "&" or "?"
// Username and password should always be extracted as separate fields
// and are not allowed to remain embeded in publishing URL
// and are not allowed to remain embedded in publishing URL
function FormatUrlForPublishing(url)
{
url = TrimString(StripUsernamePassword(url));

4
mozilla/layout/generic/nsObjectFrame.cpp
View File

@@ -1370,8 +1370,8 @@ nsObjectFrame::InstantiatePlugin(nsPresContext* aPresContext,
if (NS_SUCCEEDED(rv))
pDoc->SetStreamListener(stream);
} else { /* embedded mode */
rv = aPluginHost->InstantiateEmbededPlugin(aMimeType, aURI,
mInstanceOwner);
rv = aPluginHost->InstantiateEmbeddedPlugin(aMimeType, aURI,
mInstanceOwner);
}
#ifdef DEBUG
mInstantiating = PR_FALSE;

2
mozilla/layout/generic/nsSpaceManager.cpp
View File

@@ -1070,7 +1070,7 @@ nsSpaceManager::PopState()
// Now that we've restored our state, pop the topmost
// state and delete it. Make sure not to delete the mAutoState element
// as it is embeded in this class
// as it is embedded in this class
SpaceManagerState *state = mSavedStates;
mSavedStates = mSavedStates->mNext;

2
mozilla/modules/plugin/base/public/nsIPluginHost.idl
View File

@@ -66,7 +66,7 @@ interface nsIPluginHost : nsIFactory
void getPluginFactory(in string aMimeType, out nsIPlugin aPlugin);
void instantiateEmbededPlugin(in string aMimeType, in nsIURI aURL, in nsIPluginInstanceOwner aOwner);
void instantiateEmbeddedPlugin(in string aMimeType, in nsIURI aURL, in nsIPluginInstanceOwner aOwner);
void instantiateFullPagePlugin(in string aMimeType, in nsIURI aURI, in nsIStreamListenerRef aStreamListener, in nsIPluginInstanceOwner aOwner);

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

@@ -1216,7 +1216,7 @@ public:
nsIPluginStreamListener *aListener,
PRInt32 requestCount = 1);
nsresult InitializeEmbeded(nsIURI *aURL,
nsresult InitializeEmbedded(nsIURI *aURL,
nsIPluginInstance* aInstance,
nsIPluginInstanceOwner *aOwner = nsnull,
nsIPluginHost *aHost = nsnull);
@@ -1741,23 +1741,23 @@ nsresult nsPluginStreamListenerPeer::Initialize(nsIURI *aURL,
/*
Called by NewEmbededPluginStream() - if this is called, we weren't
Called by NewEmbeddedPluginStream() - if this is called, we weren't
able to load the plugin, so we need to load it later once we figure
out the mimetype. In order to load it later, we need the plugin
host and instance owner.
*/
////////////////////////////////////////////////////////////////////////
nsresult nsPluginStreamListenerPeer::InitializeEmbeded(nsIURI *aURL,
nsIPluginInstance* aInstance,
nsIPluginInstanceOwner *aOwner,
nsIPluginHost *aHost)
nsresult nsPluginStreamListenerPeer::InitializeEmbedded(nsIURI *aURL,
nsIPluginInstance* aInstance,
nsIPluginInstanceOwner *aOwner,
nsIPluginHost *aHost)
{
#ifdef PLUGIN_LOGGING
nsCAutoString urlSpec;
if(aURL != nsnull) (void)aURL->GetSpec(urlSpec);
PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
("nsPluginStreamListenerPeer::InitializeEmbeded url=%s\n", urlSpec.get()));
("nsPluginStreamListenerPeer::InitializeEmbedded url=%s\n", urlSpec.get()));
PR_LogFlush();
#endif
@@ -1766,7 +1766,7 @@ nsresult nsPluginStreamListenerPeer::InitializeEmbeded(nsIURI *aURL,
NS_ADDREF(mURL);
if(aInstance != nsnull) {
NS_ASSERTION(mInstance == nsnull, "nsPluginStreamListenerPeer::InitializeEmbeded mInstance != nsnull");
NS_ASSERTION(mInstance == nsnull, "nsPluginStreamListenerPeer::InitializeEmbedded mInstance != nsnull");
mInstance = aInstance;
NS_ADDREF(mInstance);
} else {
@@ -2049,7 +2049,7 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request,
// we weren't able to load a plugin previously because we
// didn't have the mimetype. Now that we do (aContentType),
// we'll try again with SetUpPluginInstance()
// which is called by InstantiateEmbededPlugin()
// which is called by InstantiateEmbeddedPlugin()
// NOTE: we don't want to try again if we didn't get the MIME type this time
if ((nsnull == mInstance) && (nsnull != mOwner) && (!aContentType.IsEmpty()))
@@ -2063,7 +2063,7 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request,
nsPluginMode mode;
mOwner->GetMode(&mode);
if (mode == nsPluginMode_Embedded)
rv = mHost->InstantiateEmbededPlugin(aContentType.get(), aURL, mOwner);
rv = mHost->InstantiateEmbeddedPlugin(aContentType.get(), aURL, mOwner);
else
rv = mHost->SetUpPluginInstance(aContentType.get(), aURL, mOwner);
@@ -3293,8 +3293,8 @@ nsPluginHostImpl::GetPluginTempDir(nsIFile **aDir)
////////////////////////////////////////////////////////////////////////
/* Called by nsPluginInstanceOwner (nsObjectFrame.cpp - embeded case) */
NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
/* Called by nsPluginInstanceOwner (nsObjectFrame.cpp - embedded case) */
NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbeddedPlugin(const char *aMimeType,
nsIURI* aURL,
nsIPluginInstanceOwner *aOwner)
{
@@ -3303,7 +3303,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
if(aURL != nsnull) (void)aURL->GetAsciiSpec(urlSpec);
PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
("nsPluginHostImpl::InstatiateEmbededPlugin Begin mime=%s, owner=%p, url=%s\n",
("nsPluginHostImpl::InstatiateEmbeddedPlugin Begin mime=%s, owner=%p, url=%s\n",
aMimeType, aOwner, urlSpec.get()));
PR_LogFlush();
@@ -3361,7 +3361,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
// Determine if the scheme of this URL is one we can handle internaly because we should
// only open the initial stream if it's one that we can handle internally. Otherwise
// |NS_OpenURI| in |InstantiateEmbededPlugin| may open up a OS protocal registered helper app
// |NS_OpenURI| in |InstantiateEmbeddedPlugin| may open up a OS protocal registered helper app
PRBool bCanHandleInternally = PR_FALSE;
nsCAutoString scheme;
if (aURL && NS_SUCCEEDED(aURL->GetScheme(scheme))) {
@@ -3376,11 +3376,11 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
if(FindStoppedPluginForURL(aURL, aOwner) == NS_OK) {
PLUGIN_LOG(PLUGIN_LOG_NOISY,
("nsPluginHostImpl::InstatiateEmbededPlugin FoundStopped mime=%s\n", aMimeType));
("nsPluginHostImpl::InstatiateEmbeddedPlugin FoundStopped mime=%s\n", aMimeType));
aOwner->GetInstance(instance);
if((!aMimeType || !isJava) && bCanHandleInternally)
rv = NewEmbededPluginStream(aURL, aOwner, instance);
rv = NewEmbeddedPluginStream(aURL, aOwner, instance);
// notify Java DOM component
nsresult res;
@@ -3396,7 +3396,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
// if we don't have a MIME type at this point, we still have one more chance by
// opening the stream and seeing if the server hands one back
if (!aMimeType)
return bCanHandleInternally ? NewEmbededPluginStream(aURL, aOwner, nsnull) : NS_ERROR_FAILURE;
return bCanHandleInternally ? NewEmbeddedPluginStream(aURL, aOwner, nsnull) : NS_ERROR_FAILURE;
rv = SetUpPluginInstance(aMimeType, aURL, aOwner);
@@ -3472,7 +3472,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
}
if(havedata && !isJava && bCanHandleInternally)
rv = NewEmbededPluginStream(aURL, aOwner, instance);
rv = NewEmbeddedPluginStream(aURL, aOwner, instance);
// notify Java DOM component
nsresult res;
@@ -3489,7 +3489,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
if(aURL != nsnull) (void)aURL->GetAsciiSpec(urlSpec2);
PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
("nsPluginHostImpl::InstatiateEmbededPlugin Finished mime=%s, rv=%d, owner=%p, url=%s\n",
("nsPluginHostImpl::InstatiateEmbeddedPlugin Finished mime=%s, rv=%d, owner=%p, url=%s\n",
aMimeType, rv, aOwner, urlSpec2.get()));
PR_LogFlush();
@@ -3818,7 +3818,7 @@ NS_IMETHODIMP nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
// someone else (e.g., a plugin) on a different thread, the proxy JNI will
// not work, and break LiveConnect.
// Currently, on Unix, when instantiating a Java plugin instance (by calling
// InstantiateEmbededPlugin() next), Java plugin will create the proxy JNI
// InstantiateEmbeddedPlugin() next), Java plugin will create the proxy JNI
// if it is not created yet. If that happens, LiveConnect will be broken.
// Before lazy start JVM was implemented, since at this point the browser
// already created the proxy JNI buring startup, the problem did not happen.
@@ -5884,10 +5884,10 @@ nsPluginHostImpl::StopPluginInstance(nsIPluginInstance* aInstance)
}
////////////////////////////////////////////////////////////////////////
/* Called by InstantiateEmbededPlugin() */
nsresult nsPluginHostImpl::NewEmbededPluginStream(nsIURI* aURL,
nsIPluginInstanceOwner *aOwner,
nsIPluginInstance* aInstance)
/* Called by InstantiateEmbeddedPlugin() */
nsresult nsPluginHostImpl::NewEmbeddedPluginStream(nsIURI* aURL,
nsIPluginInstanceOwner *aOwner,
nsIPluginInstance* aInstance)
{
if (!aURL)
return NS_OK;
@@ -5903,9 +5903,9 @@ nsresult nsPluginHostImpl::NewEmbededPluginStream(nsIURI* aURL,
// so the listener can set up the instance later after
// we've determined the mimetype of the stream
if(aInstance != nsnull)
rv = listener->InitializeEmbeded(aURL, aInstance);
rv = listener->InitializeEmbedded(aURL, aInstance);
else if(aOwner != nsnull)
rv = listener->InitializeEmbeded(aURL, nsnull, aOwner, this);
rv = listener->InitializeEmbedded(aURL, nsnull, aOwner, this);
else
rv = NS_ERROR_ILLEGAL_VALUE;

4
mozilla/modules/plugin/base/src/nsPluginHostImpl.h
View File

@@ -267,7 +267,7 @@ public:
GetPluginFactory(const char *aMimeType, nsIPlugin** aPlugin);
NS_IMETHOD
InstantiateEmbededPlugin(const char *aMimeType, nsIURI* aURL, nsIPluginInstanceOwner *aOwner);
InstantiateEmbeddedPlugin(const char *aMimeType, nsIURI* aURL, nsIPluginInstanceOwner *aOwner);
NS_IMETHOD
InstantiateFullPagePlugin(const char *aMimeType, nsIURI* aURI, nsIStreamListener *&aStreamListener, nsIPluginInstanceOwner *aOwner);
@@ -418,7 +418,7 @@ private:
LoadXPCOMPlugins(nsIComponentManager* aComponentManager);
nsresult
NewEmbededPluginStream(nsIURI* aURL, nsIPluginInstanceOwner *aOwner, nsIPluginInstance* aInstance);
NewEmbeddedPluginStream(nsIURI* aURL, nsIPluginInstanceOwner *aOwner, nsIPluginInstance* aInstance);
nsresult
NewFullPagePluginStream(nsIStreamListener *&aStreamListener, nsIPluginInstance *aInstance);

2
mozilla/widget/src/gtkxtbin/gtk2xtbin.c
View File

@@ -485,7 +485,7 @@ gtk_xtbin_destroy (GtkObject *object)
}
/*
* Following is the implementation of Xt XEmbeded for client side
* Following is the implementation of Xt XEmbedded for client side
*/
/* Initial Xt plugin */

2
mozilla/widget/src/gtkxtbin/gtk2xtbin.h
View File

@@ -76,7 +76,7 @@ typedef struct _XtClient XtClient;
struct _XtClient {
Display *xtdisplay;
Widget top_widget; /* The toplevel widget */
Widget child_widget; /* The embeded widget */
Widget child_widget; /* The embedded widget */
Visual *xtvisual;
int xtdepth;
Colormap xtcolormap;

16
mozilla/widget/src/gtkxtbin/gtkxtbin.c
View File

@@ -236,7 +236,7 @@ gtk_xtbin_realize (GtkWidget *widget)
gint width, height;
Widget top_widget;
Window win;
Widget embeded;
Widget embedded;
#ifdef DEBUG_XTBIN
printf("gtk_xtbin_realize()\n");
@@ -323,7 +323,7 @@ gtk_xtbin_realize (GtkWidget *widget)
XtSetArg(args[n], XtNwidth, xtbin->width);n++;
XtSetValues(top_widget, args, n);
embeded = XtVaCreateWidget("form", compositeWidgetClass, top_widget, NULL);
embedded = XtVaCreateWidget("form", compositeWidgetClass, top_widget, NULL);
n = 0;
XtSetArg(args[n], XtNheight, xtbin->height);n++;
@@ -331,7 +331,7 @@ gtk_xtbin_realize (GtkWidget *widget)
XtSetArg(args[n], XtNvisual, GDK_VISUAL_XVISUAL(gdk_window_get_visual( xtbin->parent_window )) ); n++;
XtSetArg(args[n], XtNdepth, gdk_window_get_visual( xtbin->parent_window )->depth ); n++;
XtSetArg(args[n], XtNcolormap, GDK_COLORMAP_XCOLORMAP(gdk_window_get_colormap( xtbin->parent_window)) ); n++;
XtSetValues(embeded, args, n);
XtSetValues(embedded, args, n);
/* Ok, here is the dirty little secret on how I am */
/* switching the widget's XWindow to the GdkWindow's XWindow. */
@@ -352,21 +352,21 @@ gtk_xtbin_realize (GtkWidget *widget)
top_widget);
#endif
XtRealizeWidget(embeded);
XtRealizeWidget(embedded);
#ifdef DEBUG_XTBIN
printf("embeded window = %li\n", XtWindow(embeded));
printf("embedded window = %li\n", XtWindow(embedded));
#endif
XtManageChild(embeded);
XtManageChild(embedded);
/* now fill out the xtbin info */
xtbin->xtwindow = XtWindow(embeded);
xtbin->xtwindow = XtWindow(embedded);
/* listen to all Xt events */
XSelectInput(xtbin->xtdisplay,
XtWindow(top_widget),
0x0FFFFF);
XSelectInput(xtbin->xtdisplay,
XtWindow(embeded),
XtWindow(embedded),
0x0FFFFF);
XFlush(xtbin->xtdisplay);
}

16
mozilla/widget/src/xlibxtbin/xlibxtbin.cpp
View File

@@ -71,7 +71,7 @@ void xtbin::xtbin_realize() {
Arg args[2];
int n;
Widget top_widget;
Widget embeded;
Widget embedded;
XSetWindowAttributes attr;
unsigned long mask;
@@ -127,32 +127,32 @@ void xtbin::xtbin_realize() {
XtSetArg(args[n], XtNwidth, width); n++;
XtSetValues(top_widget, args, n);
embeded = XtVaCreateWidget("form", compositeWidgetClass, top_widget, NULL);
embedded = XtVaCreateWidget("form", compositeWidgetClass, top_widget, NULL);
n = 0;
XtSetArg(args[n], XtNheight, height); n++;
XtSetArg(args[n], XtNwidth, width); n++;
XtSetValues(embeded, args, n);
XtSetValues(embedded, args, n);
oldwindow = top_widget->core.window;
top_widget->core.window = window;
XtRegisterDrawable(xtdisplay, window, top_widget);
XtRealizeWidget(embeded);
XtRealizeWidget(embedded);
XtRealizeWidget(top_widget);
XtManageChild(embeded);
XtManageChild(embedded);
/* Now fill out the xtbin info */
xtwindow = XtWindow(embeded);
xtwindow = XtWindow(embedded);
/* Suppress background refresh flashing */
XSetWindowBackgroundPixmap(xtdisplay, XtWindow(top_widget), None);
XSetWindowBackgroundPixmap(xtdisplay, XtWindow(embeded), None);
XSetWindowBackgroundPixmap(xtdisplay, XtWindow(embedded), None);
/* Listen to all Xt events */
XSelectInput(xtdisplay, XtWindow(top_widget), 0x0fffff);
XSelectInput(xtdisplay, XtWindow(embeded), 0x0fffff);
XSelectInput(xtdisplay, XtWindow(embedded), 0x0fffff);
sync();
}