b=340517, classic windows native themes broken; r=stuart

widget/src/windows/nsNativeThemeWin.cpp

@@ -1971,11 +1971,6 @@ nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsIRenderingContext* aCon
   /* Need to force the clip to be set */
   ctx->UpdateSurfaceClip();
 
-  /* Set the device offsets as appropriate */
-  POINT origViewportOrigin;
-  GetViewportOrgEx(hdc, &origViewportOrigin);
-  SetViewportOrgEx(hdc, origViewportOrigin.x - (int) xoff, origViewportOrigin.y - (int) yoff, NULL);
-
   /* Covert the current transform to a world transform */
   gfxMatrix m = ctx->CurrentMatrix();
   XFORM xform;
@@ -1989,6 +1984,11 @@ nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsIRenderingContext* aCon
   xform.eDy  = (FLOAT) dm[5];
   SetWorldTransform (hdc, &xform);
 
+  /* Set the device offsets as appropriate */
+  POINT origViewportOrigin;
+  GetViewportOrgEx(hdc, &origViewportOrigin);
+  SetViewportOrgEx(hdc, origViewportOrigin.x + (int) xoff, origViewportOrigin.y + (int) yoff, NULL);
+
 #else /* non-MOZ_CAIRO_GFX */
 
   nsTransform2D* transformMatrix;