compositor_unittests target is unimplmented on Mac

ui/gfx/gl/gl_context_mac.mm

Index: ui/gfx/gl/gl_context_mac.mm
diff --git a/ui/gfx/gl/gl_context_mac.cc b/ui/gfx/gl/gl_context_mac.mm
similarity index 86%
rename from ui/gfx/gl/gl_context_mac.cc
rename to ui/gfx/gl/gl_context_mac.mm
index 0c870e21726672dff608fe795a4d5fea110b7b4a..9bd7aef5b1612c5076fa22a193e0b31238d75cc2 100644
--- a/ui/gfx/gl/gl_context_mac.cc
+++ b/ui/gfx/gl/gl_context_mac.mm
@@ -13,8 +13,11 @@
 #include "ui/gfx/gl/gl_context_osmesa.h"
 #include "ui/gfx/gl/gl_context_stub.h"
 #include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_cgl.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
+#include "ui/gfx/gl/gl_surface.h"
+
+#if defined(USE_WEBKIT_COMPOSITOR)
+#include "ui/gfx/gl/gl_context_nsview.h"
+#endif
 
 namespace {
 
@@ -38,9 +41,18 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
     GpuPreference gpu_preference) {
   switch (GetGLImplementation()) {
     case kGLImplementationDesktopGL: {
-      scoped_refptr<GLContext> context(new GLContextCGL(share_group));
-      if (!context->Initialize(compatible_surface, gpu_preference))
-        return NULL;
+      scoped_refptr<GLContext> context;
+      if (compatible_surface->IsOffscreen()) {
+        context = new GLContextCGL(share_group);
+        if (!context->Initialize(compatible_surface, gpu_preference))
+          return NULL;
+      } else {
+#if defined(USE_WEBKIT_COMPOSITOR)

[piman, 2011/11/16 20:55:59]

I don't think USE_WEBKIT_COMPOSITOR ought to have any impact here.
USE_WEBKIT_COMPOSITOR is whether ui::Compositor is implemented using WebKit or
the "old" compositor. But It shouldn't have any impact on the context
implementation, which is lower in the stack.
In particular this code is used in the GPU process as well, where
USE_WEBKIT_COMPOSITOR has absolutely no meaning.

What would happen if this code was enabled in all cases?

[dhollowa, 2011/11/16 23:28:59]

Due to the different definition of the PluginWindowHandle type, compilation of
GLSurfaceNSView fails in the use_aura=0 case (see my comment in
native_widget_types.h).  Since GLSurfaceNSView and GLContextNSView only work
together, I feel it is best to only compile and link them in to a given
configuration as a pair.

Note, I've change this and elsewhere to "USE_AURA" instead of
"USE_WEBKIT_COMPOSITOR" to better reflect that this is a platform difference,
not just a configuration difference.

On 2011/11/16 20:55:59, piman wrote:

+        context = new GLContextNSView(share_group);
+        if (!context->Initialize(compatible_surface, gpu_preference))
+          return NULL;
+#endif
+      }
 
       return context;
     }