Oops, fix Linux build failures in r78239 caused by a bad resolve with r77904 ...

core/cross/cairo/texture_cairo.cc

 /*
  * Copyright 2011, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 31 matching lines @@
 namespace o3d {
 
 namespace {
 
 Texture::RGBASwizzleIndices g_gl_abgr32f_swizzle_indices = {0, 1, 2, 3};
 
 }  // anonymous namespace.
 
 namespace o2d {
 
+// This is equivalent to the CAIRO_FORMAT_INVALID enum value, but we can't refer
+// to that because it was only recently added to the Cairo headers and thus it
+// is not present on the Linux buildbots (where we use the OS version of Cairo
+// rather than the one in third_party).
+static const cairo_format_t kCairoFormatInvalid =
+    static_cast<cairo_format_t>(-1);
+
 static cairo_format_t CairoFormatFromO3DFormat(
     Texture::Format format) {
   switch (format) {
     case Texture::ARGB8:
       return CAIRO_FORMAT_ARGB32;
     case Texture::XRGB8:
       return CAIRO_FORMAT_RGB24;
     default:
-      return CAIRO_FORMAT_INVALID;
+      return kCairoFormatInvalid;
   }
   // Cairo also supports two other pure-alpha formats, but we don't expose those
   // capabilities.
 }
 
 TextureCairo::TextureCairo(ServiceLocator* service_locator,
                            cairo_surface_t* image_surface,
                            Texture::Format format,
                            int levels,
                            int width,
@@ skipping 13 matching lines @@
 // Creates a new texture object from scratch.
 TextureCairo* TextureCairo::Create(ServiceLocator* service_locator,
                                    Texture::Format format,
                                    int levels,
                                    int width,
                                    int height,
                                    bool enable_render_surfaces) {
   cairo_format_t cairo_format = CairoFormatFromO3DFormat(format);
   cairo_surface_t* image_surface;
   cairo_status_t status;
-  if (CAIRO_FORMAT_INVALID == cairo_format) {
+  if (kCairoFormatInvalid == cairo_format) {
     DLOG(ERROR) << "Texture format " << format << " not supported by Cairo";
     goto fail0;
   }
   image_surface = cairo_image_surface_create(
       cairo_format,
       width,
       height);
   status = cairo_surface_status(image_surface);
   if (CAIRO_STATUS_SUCCESS != status) {
     DLOG(ERROR) << "Error creating Cairo image surface: " << status;
@@ skipping 113 matching lines @@
 
 // Returns the implementation-specific texture handle for this texture.
 void* TextureCairo::GetTextureHandle() const {
   NOTIMPLEMENTED();
   return reinterpret_cast<void*>(NULL);
 }
 
 }  // namespace o2d
 
 }  // namespace o3d