wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 729155: Fix warnings in plugin ipc code. r=bsmedberg

Browse Source
This commit is contained in:
Josh Aas 2012-02-21 19:32:06 -05:00
parent 8082b479e4
commit 1fce7d11b3
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/plugins/ipc/PluginInstanceChild.cpp
View File

@ -2542,13 +2542,13 @@ PluginInstanceChild::MaybeCreatePlatformHelperSurface(void)
return false;
}
#ifdef MOZ_X11
#ifdef MOZ_PLATFORM_MAEMO
// On maemo plugins support non-default visual rendering
bool supportNonDefaultVisual = true;
#else
bool supportNonDefaultVisual = false;
#endif
#ifdef MOZ_X11
Screen* screen = DefaultScreenOfDisplay(mWsInfo.display);
Visual* defaultVisual = DefaultVisualOfScreen(screen);
Visual* visual = nsnull;

14
dom/plugins/ipc/PluginInstanceParent.cpp
View File

@ -129,20 +129,6 @@ PluginInstanceParent::Init()
return !!mScriptableObjects.Init();
}
namespace {
PLDHashOperator
ActorCollect(const void* aKey,
PluginScriptableObjectParent* aData,
void* aUserData)
{
nsTArray<PluginScriptableObjectParent*>* objects =
reinterpret_cast<nsTArray<PluginScriptableObjectParent*>*>(aUserData);
return objects->AppendElement(aData) ? PL_DHASH_NEXT : PL_DHASH_STOP;
}
} // anonymous namespace
void
PluginInstanceParent::ActorDestroy(ActorDestroyReason why)
{

2
dom/plugins/ipc/PluginMessageUtils.cpp
View File

@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent,
}
}
#if defined(OS_LINUX)
static string
ReplaceAll(const string& haystack, const string& needle, const string& with)
{
@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
return munged;
}
#endif
string
MungePluginDsoPath(const string& path)

2
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -206,7 +206,7 @@ PluginModuleParent::TimeoutChanged(const char* aPref, void* aModule)
} else if (!strcmp(aPref, kParentTimeoutPref)) {
// The timeout value used by the child for its parent
PRInt32 timeoutSecs = Preferences::GetInt(kParentTimeoutPref, 0);
static_cast<PluginModuleParent*>(aModule)->SendSetParentHangTimeout(timeoutSecs);
unused << static_cast<PluginModuleParent*>(aModule)->SendSetParentHangTimeout(timeoutSecs);
}
return 0;
}