328116 - Implement Cairo-on-OSX for Thebes gfx

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Add native CG rendering using cairo on Cocoa-widget-based Gecko builds.

Comment 1

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Attachment: cocoa widget changes

Small set of glue needed in cocoa widgets code to get cairo rendering going; will be expanded as time goes on, but this gets things up in the first run.  Eventually a lot of the QD-specific rendering code will be able to just go away (this patch already bypasses a large chunk for cairo builds).

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Attachment: bulk of work, cairo + thebes patches

this has most of the work, including a CG-backed cairo surface implementation.

This also moves SystemFont stuff into separate per-platform files in gfx/src/thebes, instead of having things like GTK be handled differently than windows.

gfxAtsuiFonts is a bare rough outline needed to get text on the screen; this will be the focus of future work.

Comment 3

[Mark Mentovai]

Comment on attachment 212646 [details] [diff] [review]
cocoa widget changes

+ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)

Ew, why not ifdef MOZ_ENABLE_CAIRO_GFX?

+  fprintf (stderr, "nsChildView[%p]::UpdateWidget called!\n", this);

You've got a few of these scattered throughout.  Any reason they're not within #ifdef DEBUG or something else?

r=me with satisfactory answers to those questions.

Comment 4

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

(In reply to comment #3)
> (From update of attachment 212646 [details] [diff] [review] [edit])
> +ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)
> 
> Ew, why not ifdef MOZ_ENABLE_CAIRO_GFX?

Already changed, just didn't update the patch :)

> +  fprintf (stderr, "nsChildView[%p]::UpdateWidget called!\n", this);
> 
> You've got a few of these scattered throughout.  Any reason they're not within
> #ifdef DEBUG or something else?

Changed those to #ifdef DEBUG_vladimir

Comment 5

[Simon Fraser [no longer active]]

Re: finding fonts from their names, see bug 246527.

Comment 6

[Simon Fraser [no longer active]]

Comment on attachment 212646 [details] [diff] [review]
cocoa widget changes

>Index: widget/src/cocoa/nsChildView.mm
>===================================================================


>+#ifdef MOZ_CAIRO_GFX
>+gfxASurface*
>+nsChildView::GetThebesSurface()
>+{
>+  fprintf (stderr, "nsChildView[%p]::GetThebesSurface\n", this);
>+
>+  return new gfxQuartzSurface(gfxASurface::ImageFormatARGB32, 1, 1);
>+}
>+#endif

Do you really want to create one every time? If this is normal, then maybe the method name should be CreateThebesSurface().


>+#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

"Rectangle" has to be the worst method name ever.

Comment 7

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

(In reply to comment #6)
> (From update of attachment 212646 [details] [diff] [review] [edit])
> >Index: widget/src/cocoa/nsChildView.mm
> >===================================================================
> >+#ifdef MOZ_CAIRO_GFX
> >+gfxASurface*
> >+nsChildView::GetThebesSurface()
> >+{
> >+  fprintf (stderr, "nsChildView[%p]::GetThebesSurface\n", this);
> >+
> >+  return new gfxQuartzSurface(gfxASurface::ImageFormatARGB32, 1, 1);
> >+}
> >+#endif
> 
> Do you really want to create one every time? If this is normal, then maybe the
> method name should be CreateThebesSurface().

It's just returning a dummy surface; this method will go away relatively soon.

> 
> "Rectangle" has to be the worst method name ever.
> 

Eh, well, it's adding a rectangle to the current path.  Much better than Apple's ContextAddRectangleToCurrentPath() variety.

Comment 8

[Jonathan Watt [:jwatt]]

Has this been checked in?