diff --git a/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp b/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 47b2f46f767..f818b84718b 100644
--- a/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -808,9 +808,15 @@ nsCanvasRenderingContext2D::Render(nsIRenderingContext *rc)
     // OSX path
 
     CGrafPtr port = nsnull;
+#ifdef MOZILLA_1_8_BRANCH
     rv = rc->RetrieveCurrentNativeGraphicData((void**) &port);
     if (NS_FAILED(rv) || !port)
         return NS_ERROR_FAILURE;
+#else
+    port = (CGrafPtr) rc->GetNativeGraphicData(nsIRenderingContext::NATIVE_MAC_THING);
+    if (!port)
+        return NS_ERROR_FAILURE;
+#endif
 
     struct Rect portRect;
     GetPortBounds(port, &portRect);
diff --git a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
index 1ec6649f52e..737f7206d09 100644
--- a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
+++ b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
@@ -1510,3 +1510,13 @@ nsRenderingContextMac::OnTigerOrLater()
   }
   return sOnTigerOrLater;
 }
+
+void*
+nsRenderingContextMac::GetNativeGraphicData(GraphicDataType aType)
+{
+  if (aType == NATIVE_MAC_THING) {
+    return mPort;
+  }
+
+  return nsnull;
+}
diff --git a/mozilla/gfx/src/mac/nsRenderingContextMac.h b/mozilla/gfx/src/mac/nsRenderingContextMac.h
index 58922028bd2..69e9ac98ae7 100644
--- a/mozilla/gfx/src/mac/nsRenderingContextMac.h
+++ b/mozilla/gfx/src/mac/nsRenderingContextMac.h
@@ -150,6 +150,7 @@ public:
   NS_IMETHOD ReleaseBackbuffer(void);
   NS_IMETHOD UseBackbuffer(PRBool* aUseBackbuffer);
 
+  virtual void* GetNativeGraphicData(GraphicDataType aType);
 
 #ifdef MOZ_MATHML
   /**