Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout changesets a9cc84f8a830, cc9620ae893d, 5d571e06dc66, ebfde1103126, 0ad7a620910f, 0e614362b322, c53f88f0dd06, b4bab5f00821 due to bustage.

Browse Source
This commit is contained in:
Marco Bonardo 2011-06-24 17:18:28 +02:00
parent a0fb99c06b
commit bfe9e423e8
3 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ipc/glue/IPCMessageUtils.h
View File

@ -42,8 +42,6 @@
#include "chrome/common/ipc_message_utils.h"
#include "prtypes.h"
#include "nsID.h"
#include "nsMemory.h"
#include "nsStringGlue.h"
#include "nsTArray.h"
#include "gfx3DMatrix.h"
@ -689,48 +687,6 @@ struct ParamTraits<nsRect>
}
};
template<>
struct ParamTraits<nsID>
{
typedef nsID paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, aParam.m0);
WriteParam(aMsg, aParam.m1);
WriteParam(aMsg, aParam.m2);
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(aParam.m3); i++) {
WriteParam(aMsg, aParam.m3[i]);
}
}
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
if(!ReadParam(aMsg, aIter, &(aResult->m0)) ||
!ReadParam(aMsg, aIter, &(aResult->m1)) ||
!ReadParam(aMsg, aIter, &(aResult->m2)))
return false;
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(aResult->m3); i++)
if (!ReadParam(aMsg, aIter, &(aResult->m3[i])))
return false;
return true;
}
static void Log(const paramType& aParam, std::wstring* aLog)
{
aLog->append(L"{");
aLog->append(StringPrintf(L"%8.8X-%4.4X-%4.4X-",
aParam.m0,
aParam.m1,
aParam.m2));
for (unsigned int i = 0; i < NS_ARRAY_LENGTH(aParam.m3); i++)
aLog->append(StringPrintf(L"%2.2X", aParam.m3[i]));
aLog->append(L"}");
}
};
} /* namespace IPC */
#endif /* __IPC_GLUE_IPCMESSAGEUTILS_H__ */

3
widget/src/windows/Makefile.in
View File

@ -73,7 +73,6 @@ CPPSRCS = \
JumpListItem.cpp \
GfxInfo.cpp \
WidgetTraceEvent.cpp \
AudioSession.cpp \
$(NULL)
ifdef MOZ_CRASHREPORTER
@ -117,8 +116,6 @@ endif
EXPORTS = nsdefs.h WindowHook.h
EXPORTS_NAMESPACES = mozilla/widget
EXPORTS_mozilla/widget = AudioSession.h
LOCAL_INCLUDES = \
-I. \

13
widget/src/windows/nsAppShell.cpp
View File

@ -45,7 +45,6 @@
#include "WinTaskbar.h"
#include "nsString.h"
#include "nsIMM32Handler.h"
#include "mozilla/widget/AudioSession.h"
// For skidmark code
#include <windows.h>
@ -245,20 +244,10 @@ nsAppShell::Run(void)
{
LoadedModuleInfo modules[NUM_LOADEDMODULEINFO];
memset(modules, 0, sizeof(modules));
sLoadedModules = modules;
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
// Ignore failure; failing to start the application is not exactly an
// appropriate response to failing to start an audio session.
mozilla::widget::StartAudioSession();
#endif
sLoadedModules = modules;
nsresult rv = nsBaseAppShell::Run();
#ifdef MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
mozilla::widget::StopAudioSession();
#endif
// Don't forget to null this out!
sLoadedModules = nsnull;