Backed out changeset 4f928f174d21 (bug 1313560) for not actually fixing the problem
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 27 Oct 2016 21:57:49 -0700
changeset 319966 691c898f58a275dd965ad6bca4d93ea8f98c3996
parent 319965 4f928f174d21555a623a2ba24dd6a8e42824fcb9
child 319967 7c24f445542062d41f97cba2dd8a45bd3a468b98
push id20749
push userryanvm@gmail.com
push dateSat, 29 Oct 2016 13:21:21 +0000
treeherderfx-team@1b170b39ed6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1313560
milestone52.0a1
backs out4f928f174d21555a623a2ba24dd6a8e42824fcb9
Backed out changeset 4f928f174d21 (bug 1313560) for not actually fixing the problem MozReview-Commit-ID: 4oDXzISkhdi
layout/generic/nsImageFrame.cpp
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -74,21 +74,16 @@
 #include "mozilla/StyleSetHandleInlines.h"
 #include "nsBlockFrame.h"
 #include "nsStyleStructInlines.h"
 
 #include "mozilla/Preferences.h"
 
 #include "mozilla/dom/Link.h"
 
-// Undo the windows.h damage
-#if defined(XP_WIN) && defined(LoadImage)
-#undef LoadImage
-#endif
-
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::gfx;
 using namespace mozilla::image;
 using namespace mozilla::layers;
 
 // sizes (pixels) for image icon, padding and border frame
 #define ICON_SIZE        (16)