Bug 554835 - Build fixes for undefined MOZ_IPC. r=bnewman,joe
authorJosh Matthews <josh@joshmatthews.net>
Thu, 25 Mar 2010 12:10:14 -0400
changeset 46769 437ca4f9a036d2677eb53da17f5c69bd21f171e1
parent 46768 6b944ce388e893e1c9bb069d7b82ae9bc0a8801d
child 46770 9f69e891fb0893080450325f94d4f5a9cc6a296d
push idunknown
push userunknown
push dateunknown
reviewersbnewman, joe
bugs554835
milestone1.9.3a4pre
Bug 554835 - Build fixes for undefined MOZ_IPC. r=bnewman,joe
content/base/src/nsFrameLoader.cpp
content/base/src/nsFrameLoader.h
content/canvas/src/WebGLContext.h
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -1596,28 +1596,29 @@ nsFrameLoader::SendCrossProcessKeyEvent(
   }
 #endif
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsFrameLoader::GetCrossProcessObjectWrapper(nsIVariant** cpow)
 {
+#ifdef MOZ_IPC
    nsIXPConnect* xpc;
    nsIThreadJSContextStack* stack;
    JSContext* cx;
    JSObject* global;
  
    if ((xpc = nsContentUtils::XPConnect()) &&
        (stack = nsContentUtils::ThreadJSContextStack()) &&
        NS_SUCCEEDED(stack->Peek(&cx)) && cx &&
        mChildProcess->GetGlobalJSObject(cx, &global)) {
      return xpc->JSToVariant(cx, OBJECT_TO_JSVAL(global), cpow);
    }
-  
+#endif
    return NS_ERROR_NOT_AVAILABLE;
 }
 
 nsresult
 nsFrameLoader::CreateStaticClone(nsIFrameLoader* aDest)
 {
   nsFrameLoader* dest = static_cast<nsFrameLoader*>(aDest);
   dest->MaybeCreateDocShell();
--- a/content/base/src/nsFrameLoader.h
+++ b/content/base/src/nsFrameLoader.h
@@ -135,18 +135,18 @@ public:
   // frame loader owner needs to call this, and pass in the two references to
   // nsRefPtrs for frame loaders that need to be swapped.
   nsresult SwapWithOtherLoader(nsFrameLoader* aOther,
                                nsRefPtr<nsFrameLoader>& aFirstToSwap,
                                nsRefPtr<nsFrameLoader>& aSecondToSwap);
 
 #ifdef MOZ_IPC
   mozilla::dom::PIFrameEmbeddingParent* GetChildProcess();
+#endif
   NS_IMETHOD GetCrossProcessObjectWrapper(nsIVariant** cpow);
-#endif
 
   nsFrameMessageManager* GetFrameMessageManager() { return mMessageManager; }
 
 private:
 
 #ifdef MOZ_IPC
   bool ShouldUseRemoteProcess();
 #endif
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -240,21 +240,19 @@ public:
     NS_IMETHOD Render(gfxContext *ctx, gfxPattern::GraphicsFilter f);
     NS_IMETHOD GetInputStream(const char* aMimeType,
                               const PRUnichar* aEncoderOptions,
                               nsIInputStream **aStream);
     NS_IMETHOD GetThebesSurface(gfxASurface **surface);
     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;
 
     nsICanvasElement* mCanvasElement;
 
     nsGLPbuffer *mGLPbuffer;
     PRInt32 mWidth, mHeight;