Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 554835 - Build fixes for undefined MOZ_IPC. r=bnewman,joe

Browse Source
This commit is contained in:
Josh Matthews 2010-03-25 12:10:14 -04:00
parent 66af51cda6
commit cf4d6ab043
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/src/nsFrameLoader.cpp
View File

@ -1601,6 +1601,7 @@ nsFrameLoader::SendCrossProcessKeyEvent(const nsAString& aType,
NS_IMETHODIMP
nsFrameLoader::GetCrossProcessObjectWrapper(nsIVariant** cpow)
{
#ifdef MOZ_IPC
nsIXPConnect* xpc;
nsIThreadJSContextStack* stack;
JSContext* cx;
@ -1612,7 +1613,7 @@ nsFrameLoader::GetCrossProcessObjectWrapper(nsIVariant** cpow)
mChildProcess->GetGlobalJSObject(cx, &global)) {
return xpc->JSToVariant(cx, OBJECT_TO_JSVAL(global), cpow);
}
#endif
return NS_ERROR_NOT_AVAILABLE;
}

2
content/base/src/nsFrameLoader.h
View File

@ -140,8 +140,8 @@ public:
#ifdef MOZ_IPC
mozilla::dom::PIFrameEmbeddingParent* GetChildProcess();
NS_IMETHOD GetCrossProcessObjectWrapper(nsIVariant** cpow);
#endif
NS_IMETHOD GetCrossProcessObjectWrapper(nsIVariant** cpow);
nsFrameMessageManager* GetFrameMessageManager() { return mMessageManager; }

2
content/canvas/src/WebGLContext.h
View File

@ -245,11 +245,9 @@ public:
NS_IMETHOD SetIsOpaque(PRBool b) { return NS_OK; };
NS_IMETHOD SetIsShmem(PRBool b) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Redraw(const gfxRect&) { return NS_ERROR_NOT_IMPLEMENTED; }
#ifdef MOZ_IPC
NS_IMETHOD Swap(mozilla::ipc::Shmem& aBack,
PRInt32 x, PRInt32 y, PRInt32 w, PRInt32 h)
{ return NS_ERROR_NOT_IMPLEMENTED; }
#endif
protected:
GLES20Wrap *gl;