Back out 88733ce1bef3 (bug 718440) because of Windows build failure

2012-01-17 15:15:47 -08:00
parent 818799a2f9
commit ddcbb8cdf0
20 changed files with 13 additions and 64 deletions
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -116,8 +116,6 @@
 #include "nsXULPopupManager.h"
 #endif

-#include "sampler.h"
-
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::dom;
@@ -3632,7 +3630,6 @@ nsLayoutUtils::DrawBackgroundImage(nsRenderingContext* aRenderingContext,
                                   const nsRect&       aDirty,
                                   PRUint32            aImageFlags)
 {
-  SAMPLE_LABEL("layout", "nsLayoutUtils::DrawBackgroundImage");
  return DrawImageInternal(aRenderingContext, aImage, aGraphicsFilter,
                           aDest, aFill, aAnchor, aDirty,
                           aImageSize, aImageFlags);