Bug 614721 - Remove some DirectDraw left overs. r=joedrew,jrmuizel

gfx/cairo/d2d.patch

@@ -414,12 +414,11 @@ index 3a8b8a6..21827aa 100644
  } cairo_font_type_t;
  
  cairo_public cairo_font_type_t
-@@ -2009,7 +2010,8 @@ typedef enum _cairo_surface_type {
+@@ -2009,7 +2010,7 @@ typedef enum _cairo_surface_type {
      CAIRO_SURFACE_TYPE_TEE,
      CAIRO_SURFACE_TYPE_XML,
      CAIRO_SURFACE_TYPE_SKIA,
 -    CAIRO_SURFACE_TYPE_DDRAW
-+    CAIRO_SURFACE_TYPE_DDRAW,
 +    CAIRO_SURFACE_TYPE_D2D
  } cairo_surface_type_t;
  

gfx/thebes/gfxWindowsPlatform.cpp

@@ -268,16 +268,10 @@ gfxWindowsPlatform::~gfxWindowsPlatform()
 void
 gfxWindowsPlatform::UpdateRenderMode()
 {
-/* Pick the default render mode differently between
- * desktop, Windows Mobile, and Windows CE.
+/* Pick the default render mode for
+ * desktop.
  */
-#if defined(WINCE_WINDOWS_MOBILE)
-    mRenderMode = RENDER_IMAGE_DDRAW16;
-#elif defined(WINCE)
-    mRenderMode = RENDER_DDRAW_GL;
-#else
     mRenderMode = RENDER_GDI;
-#endif
 
     OSVERSIONINFOA versionInfo;
     versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);

gfx/thebes/gfxWindowsPlatform.h

@@ -150,15 +150,6 @@ public:
         /* Use 32bpp image surfaces, and do 32->24 conversion before calling StretchDIBits */
         RENDER_IMAGE_STRETCH24,
 
-        /* Use DirectDraw on Windows CE */
-        RENDER_DDRAW,
-
-        /* Use 24bpp image surfaces, with final DirectDraw 16bpp blt on Windows CE */
-        RENDER_IMAGE_DDRAW16,
-
-        /* Use DirectDraw with OpenGL on Windows CE */
-        RENDER_DDRAW_GL,
-
         /* Use Direct2D rendering */
         RENDER_DIRECT2D,
 

widget/src/windows/nsWindowGfx.cpp

@@ -446,11 +446,8 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
           }
 #endif
           if (result) {
-            if (IsRenderMode(gfxWindowsPlatform::RENDER_DDRAW) ||
-                       IsRenderMode(gfxWindowsPlatform::RENDER_DDRAW_GL))
-            {
-            } else if (IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH24) ||
-                       IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH32)) 
+            if (IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH24) ||
+                IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH32))
             {
               gfxIntSize surfaceSize = targetSurfaceImage->GetSize();