Bug 724275 - fix -Wswitch warnings; r=jrmuizel

gfx/2d/DrawTargetCairo.cpp

@@ -142,9 +142,9 @@ PatternIsCompatible(const Pattern& aPattern)
       const RadialGradientPattern& pattern = static_cast<const RadialGradientPattern&>(aPattern);
       return pattern.mStops->GetBackendType() == BACKEND_CAIRO;
     }
+    default:
+      return true;
   }
-
-  return true;
 }
 
 // Never returns NULL. As such, you must always pass in Cairo-compatible

gfx/2d/HelpersCairo.h

@@ -118,9 +118,9 @@ GfxFormatToCairoFormat(SurfaceFormat format)
       return CAIRO_FORMAT_RGB24;
     case FORMAT_A8:
       return CAIRO_FORMAT_A8;
+    default:
+      return CAIRO_FORMAT_ARGB32;
   }
-
-  return CAIRO_FORMAT_ARGB32;
 }
 
 static inline cairo_content_t
@@ -134,9 +134,9 @@ GfxFormatToCairoContent(SurfaceFormat format)
       return CAIRO_CONTENT_COLOR;
     case FORMAT_A8:
       return CAIRO_CONTENT_ALPHA;
+    default:
+      return CAIRO_CONTENT_COLOR_ALPHA;
   }
-
-  return CAIRO_CONTENT_COLOR_ALPHA;
 }
 
 static inline cairo_line_join_t

gfx/2d/SourceSurfaceCairo.cpp

@@ -37,28 +37,13 @@
 
 #include "SourceSurfaceCairo.h"
 #include "DrawTargetCairo.h"
+#include "HelpersCairo.h"
 
 #include "cairo.h"
 
 namespace mozilla {
 namespace gfx {
 
-static cairo_format_t
-GfxFormatToCairoFormat(SurfaceFormat format)
-{
-  switch (format)
-  {
-    case FORMAT_B8G8R8A8:
-      return CAIRO_FORMAT_ARGB32;
-    case FORMAT_B8G8R8X8:
-      return CAIRO_FORMAT_RGB24;
-    case FORMAT_A8:
-      return CAIRO_FORMAT_A8;
-  }
-
-  return CAIRO_FORMAT_ARGB32;
-}
-
 static SurfaceFormat
 CairoFormatToSurfaceFormat(cairo_format_t format)
 {
@@ -70,25 +55,9 @@ CairoFormatToSurfaceFormat(cairo_format_t format)
       return FORMAT_B8G8R8X8;
     case CAIRO_FORMAT_A8:
       return FORMAT_A8;
+    default:
+      return FORMAT_B8G8R8A8;
   }
-
-  return FORMAT_B8G8R8A8;
-}
-
-static cairo_content_t
-GfxFormatToCairoContent(SurfaceFormat format)
-{
-  switch(format)
-  {
-    case FORMAT_B8G8R8A8:
-      return CAIRO_CONTENT_COLOR_ALPHA;
-    case FORMAT_B8G8R8X8:
-      return CAIRO_CONTENT_COLOR;
-    case FORMAT_A8:
-      return CAIRO_CONTENT_ALPHA;
-  }
-
-  return CAIRO_CONTENT_COLOR_ALPHA;
 }
 
 SourceSurfaceCairo::SourceSurfaceCairo(cairo_surface_t* aSurface,

gfx/thebes/gfxPattern.cpp

@@ -263,6 +263,9 @@ gfxPattern::GetPattern(mozilla::gfx::DrawTarget *aTarget)
       }
       break;
     }
+  default:
+    /* Reassure the compiler we are handling all the enum values.  */
+    break;
   }
 
   new (mColorPattern.addr()) ColorPattern(Color(0, 0, 0, 0));
@@ -322,9 +325,9 @@ gfxPattern::IsOpaque()
           return true;
         }
       }
+    default:
+      return false;
     }
-
-    return false;
   }
 
   if (mSourceSurface->GetFormat() == FORMAT_B8G8R8X8) {