diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in
index 9bac4cf55b3..2b316b04d11 100644
--- a/mozilla/widget/src/cocoa/Makefile.in
+++ b/mozilla/widget/src/cocoa/Makefile.in
@@ -73,6 +73,14 @@ REQUIRES = xpcom \
 		  exthandler \
 		  $(NULL)
 
+ifdef MOZ_ENABLE_CAIRO_GFX
+REQUIRES += thebes cairo
+
+ifdef MOZ_ENABLE_GLITZ
+REQUIRES += glitz glitzagl
+endif
+endif
+
 EXPORTS = \
 		mozView.h \
 		$(NULL)
@@ -144,6 +152,10 @@ EXTRA_DSO_LDOPTS += \
 		-lgkgfx \
 		$(NULL)
 
+ifdef MOZ_ENABLE_CAIRO_GFX
+EXTRA_DSO_LDOPTS += -lthebes
+endif
+
 GARBAGE		+= $(GFX_LCPPSRCS) $(MAC_LCPPSRCS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/widget/src/cocoa/nsChildView.h b/mozilla/widget/src/cocoa/nsChildView.h
index c3ee818911f..fa0d1ed67a3 100644
--- a/mozilla/widget/src/cocoa/nsChildView.h
+++ b/mozilla/widget/src/cocoa/nsChildView.h
@@ -59,6 +59,10 @@
 #include "nsplugindefs.h"
 #include <QuickDraw.h>
 
+#ifdef MOZ_CAIRO_GFX
+class gfxASurface;
+#endif
+
 #define NSRGB_2_COLOREF(color) \
             RGB(NS_GET_R(color),NS_GET_G(color),NS_GET_B(color))
 
@@ -70,7 +74,11 @@ struct nsPluginPort;
 class nsChildView;
 
 
+#ifdef MOZ_CAIRO_GFX
+@interface ChildView : NSView<mozView, NSTextInput>
+#else
 @interface ChildView : NSQuickDrawView<mozView, NSTextInput>
+#endif
 {
 @private
   NSWindow*       mWindow;    // shortcut to the top window, [WEAK]
@@ -254,7 +262,10 @@ public:
   
   void              LiveResizeStarted();
   void              LiveResizeEnded();
-  
+
+#ifdef MOZ_CAIRO_GFX
+  virtual gfxASurface* GetThebesSurface();
+#endif  
 protected:
 
   PRBool            ReportDestroyEvent();
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index 90342413fb5..d7453995e73 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -63,6 +63,11 @@
 #import "nsCursorManager.h"
 #import "nsWindowMap.h"
 
+#ifdef MOZ_CAIRO_GFX
+#include "gfxContext.h"
+#include "gfxQuartzSurface.h"
+#endif
+
 #define NSAppKitVersionNumber10_2 663
 
 // category of NSView methods to quiet warnings
@@ -1380,7 +1385,10 @@ nsChildView::UpdateWidget(nsRect& aRect, nsIRenderingContext* aContext)
 {
   if (! mVisible)
     return;
-  
+
+#ifdef DEBUG_vladimir
+  fprintf(stderr, "nsChildView[%p]::UpdateWidget called!\n", this);
+#else
   // For updating widgets, we _always_ want to use the NSQuickDrawView's port,
   // since that's the correct port for gecko to use to make rendering contexts.
   // The plugin is the only thing that uses the plugin port.
@@ -1409,6 +1417,7 @@ nsChildView::UpdateWidget(nsRect& aRect, nsIRenderingContext* aContext)
       Flash(paintEvent);
   }
   EndDraw();
+#endif
 }
 
 
@@ -1976,8 +1985,10 @@ nsChildView::GetQuickDrawPort()
 GrafPtr
 nsChildView::GetChildViewQuickDrawPort()
 {
+#ifndef MOZ_CAIRO_GFX
   if ([mView isKindOfClass:[ChildView class]])
     return (GrafPtr)[(ChildView*)mView qdPort];
+#endif
 
   return nsnull;
 }
@@ -2067,6 +2078,17 @@ nsChildView::Idle()
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+#ifdef MOZ_CAIRO_GFX
+gfxASurface*
+nsChildView::GetThebesSurface()
+{
+#ifdef DEBUG_vladimir
+  fprintf (stderr, "nsChildView[%p]::GetThebesSurface\n", this);
+#endif
+
+  return new gfxQuartzSurface(gfxASurface::ImageFormatARGB32, 1, 1);
+}
+#endif
 
 #pragma mark -
 
@@ -2312,7 +2334,12 @@ nsChildView::Idle()
 // 
 - (BOOL)isOpaque
 {
+#ifdef MOZ_CAIRO_GFX
+  // this will be NO when we can do transparent windows/views
+  return YES;
+#else
   return mIsPluginView;
+#endif
 }
 
 -(void)setIsPluginView:(BOOL)aIsPlugin
@@ -2412,7 +2439,64 @@ nsChildView::Idle()
   // being drawn is covered by a subview, and, if so, just bail.
   if ([self isRectObscuredBySubview:aRect])
     return;
+
+#ifdef MOZ_CAIRO_GFX
+  CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+  nsRect geckoBounds;
+  mGeckoChild->GetBounds(geckoBounds);
+  nsRefPtr<gfxQuartzSurface> targetSurface =
+    new gfxQuartzSurface(cgContext, geckoBounds.width, geckoBounds.height,
+                         PR_FALSE);
+
+  //fprintf (stderr, "Update[%p] [%f %f %f %f] cgc: %p gecko bounds: [%d %d %d %d]\n", mGeckoChild, aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height, cgContext, geckoBounds.x, geckoBounds.y, geckoBounds.width, geckoBounds.height);
+
+  CGAffineTransform xform = CGContextGetCTM(cgContext);
+  //fprintf (stderr, "  context xform: t: %f %f xx: %f xy: %f yx: %f yy: %f\n", xform.tx, xform.ty, xform.a, xform.b, xform.c, xform.d);
+
+  nsRefPtr<gfxContext> targetContext =
+    new gfxContext(targetSurface);
+
+#if 0
+  targetContext->Rectangle(gfxRect(aRect.origin.x, aRect.origin.y,
+                                   aRect.size.width, aRect.size.height));
+  targetContext->Clip();
+#else
+  const NSRect *rects;
+  int count, i;
+  [self getRectsBeingDrawn:&rects count:&count];
+  for (i = 0; i < count; ++i) {
+    //fprintf (stderr, " Clip rect[%d]: %f %f %f %f\n", i, rects[i].origin.x, rects[i].origin.y, rects[i].size.width, rects[i].size.height);
+    targetContext->Rectangle(gfxRect(rects[i].origin.x, rects[i].origin.y,
+                                     rects[i].size.width, rects[i].size.height));
+  }
+  targetContext->Clip();
+#endif
+
+  nsCOMPtr<nsIRenderingContext> rc;
+  mGeckoChild->GetDeviceContext()->CreateRenderingContextInstance(*getter_AddRefs(rc));
+  rc->Init (mGeckoChild->GetDeviceContext(), targetContext);
   
+  nsRect r, tr;
+  ConvertCocoaToGeckoRect(aRect, r);
+  tr = r;
+
+  mGeckoChild->LocalToWindowCoordinate(tr);
+  //targetContext->Translate(gfxPoint(tr.x, tr.y));
+
+  //fprintf (stderr, "  window coords: [%d %d %d %d]\n", tr.x, tr.y, tr.width, tr.height);
+
+  nsPaintEvent paintEvent(PR_TRUE, NS_PAINT, mGeckoChild);
+  paintEvent.renderingContext = rc;
+  paintEvent.rect = &r;
+
+  nsEventStatus eventStatus = nsEventStatus_eIgnore;
+  mGeckoChild->DispatchWindowEvent(paintEvent);
+
+  paintEvent.renderingContext = nsnull;
+
+  //fprintf (stderr, "---- update done ----\n");
+
+#else
   // tell gecko to paint.
   // If < 10.3, just paint the rect
   if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_2) {
@@ -2434,6 +2518,7 @@ nsChildView::Idle()
       mGeckoChild->UpdateWidget(r, rendContext);
     }
   }
+#endif
 }
 
 - (BOOL)isRectObscuredBySubview:(NSRect)inRect
diff --git a/mozilla/widget/src/cocoa/nsWidgetFactory.mm b/mozilla/widget/src/cocoa/nsWidgetFactory.mm
index b6914fe2a22..13c3b3e9a55 100644
--- a/mozilla/widget/src/cocoa/nsWidgetFactory.mm
+++ b/mozilla/widget/src/cocoa/nsWidgetFactory.mm
@@ -168,10 +168,12 @@ static const nsModuleComponentInfo gComponents[] =
     NS_NATIVESCROLLBAR_CID,
     "@mozilla.org/widget/nativescrollbar;1",
     nsNativeScrollbarConstructor },
+#ifndef MOZ_CAIRO_GFX
   { "Native Theme Renderer", 
     NS_THEMERENDERER_CID,
     "@mozilla.org/chrome/chrome-native-theme;1",
     nsNativeThemeMacConstructor },
+#endif
   { "nsScreenManager",
     NS_SCREENMANAGER_CID,
     "@mozilla.org/gfx/screenmanager;1",