diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp index d256d403f123..d302bce3b6b2 100644 --- a/widget/src/xpwidgets/nsBaseDragService.cpp +++ b/widget/src/xpwidgets/nsBaseDragService.cpp @@ -71,12 +71,9 @@ #include "nsGUIEvent.h" #include "nsIPrefService.h" -#ifdef MOZ_CAIRO_GFX #include "gfxContext.h" #include "gfxImageSurface.h" -#endif - #define DRAGIMAGES_PREF "nglayout.enable_drag_images" nsBaseDragService::nsBaseDragService() @@ -359,8 +356,6 @@ nsBaseDragService::FireDragEventAtSource(PRUint32 aMsg) return NS_OK; } -#ifdef MOZ_CAIRO_GFX - static nsIPresShell* GetPresShellForContent(nsIDOMNode* aDOMNode) { @@ -574,5 +569,3 @@ nsBaseDragService::DrawDragForImage(nsPresContext* aPresContext, gfxRect outRect = gfxRect(destRect.x, destRect.y, destRect.width, destRect.height); return img->Draw(*rc, inRect, outRect); } - -#endif diff --git a/widget/src/xpwidgets/nsBaseDragService.h b/widget/src/xpwidgets/nsBaseDragService.h index 135f94c5fae0..8cecfc22f1c7 100644 --- a/widget/src/xpwidgets/nsBaseDragService.h +++ b/widget/src/xpwidgets/nsBaseDragService.h @@ -46,9 +46,7 @@ #include "nsCOMPtr.h" #include "nsIRenderingContext.h" -#ifdef MOZ_CAIRO_GFX #include "gfxImageSurface.h" -#endif // translucency level for drag images #define DRAG_TRANSLUCENCY 0.65 @@ -79,7 +77,6 @@ public: protected: -#ifdef MOZ_CAIRO_GFX /** * Draw the drag image, if any, to a surface and return it. The drag image * is constructed from mImage if specified, or aDOMNode if mImage is null. @@ -112,7 +109,6 @@ protected: PRInt32 aScreenX, PRInt32 aScreenY, nsRect* aScreenDragRect, gfxASurface** aSurface); -#endif PRPackedBool mCanDrop; PRPackedBool mDoingDrag;