Bug 655010 - Remove WinCE code from mozilla owned parts of ImageLib; r=joe

modules/libpr0n/decoders/Makefile.in

@@ -73,7 +73,7 @@ endif
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = icon/qt icon
 endif
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 DIRS = icon/win icon
 endif
 ifeq ($(OS_ARCH),OS2)

modules/libpr0n/decoders/icon/Makefile.in

@@ -59,7 +59,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS)
 PLATFORM = qt
 endif
 
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
 endif

modules/libpr0n/src/imgFrame.cpp

@@ -50,11 +50,9 @@ static PRBool gDisableOptimize = PR_FALSE;
 
 #include "cairo.h"
 
-#if defined(XP_WIN) || defined(WINCE)
-#include "gfxWindowsPlatform.h"
-#endif
+#if defined(XP_WIN)
 
-#if defined(XP_WIN) && !defined(WINCE)
+#include "gfxWindowsPlatform.h"
 
 /* Whether to use the windows surface; only for desktop win32 */
 #define USE_WIN_SURFACE 1
@@ -112,14 +110,7 @@ static PRBool AllowedImageSize(PRInt32 aWidth, PRInt32 aHeight)
 // optimized platform-specific surfaces.
 static PRBool ShouldUseImageSurfaces()
 {
-#if defined(WINCE)
-  // There is no test on windows mobile to check for Gui resources.
-  // Allocate, until we run out of memory.
-  gfxWindowsPlatform::RenderMode rmode = gfxWindowsPlatform::GetPlatform()->GetRenderMode();
-  return rmode != gfxWindowsPlatform::RENDER_DDRAW &&
-      rmode != gfxWindowsPlatform::RENDER_DDRAW_GL;
-
-#elif defined(USE_WIN_SURFACE)
+#if defined(USE_WIN_SURFACE)
   static const DWORD kGDIObjectsHighWaterMark = 7000;
 
   if (gfxWindowsPlatform::GetPlatform()->GetRenderMode() ==

modules/libpr0n/src/imgFrame.h

@@ -125,7 +125,7 @@ public:
   {
     if (mOptSurface)
       return mOptSurface;
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
     if (mWinSurface)
       return mWinSurface;
 #elif defined(XP_MACOSX)
@@ -165,7 +165,7 @@ private: // methods
 private: // data
   nsRefPtr<gfxImageSurface> mImageSurface;
   nsRefPtr<gfxASurface> mOptSurface;
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
   nsRefPtr<gfxWindowsSurface> mWinSurface;
 #elif defined(XP_MACOSX)
   nsRefPtr<gfxQuartzImageSurface> mQuartzSurface;

modules/zlib/src/Makefile.in

@@ -50,7 +50,7 @@ LIBXUL_LIBRARY = 1
 DIST_INSTALL = 1
 
 ifndef MOZ_ENABLE_LIBXUL
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 MAPFILE	= $(LIBRARY_NAME).map
 DEFFILE	= $(win_srcdir)/zlib.def
@@ -58,7 +58,7 @@ endif
 endif
 endif
 
-ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
+ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 DEFINES	+= -DZLIB_DLL=1
 endif