Bug 648885 - Part 1: Remove 'using namespace' from nsImageFrame.h. r=roc

--HG--
extra : rebase_source : a05f252ff6efb2069d4f8096ebb70eb3ad9cc4c7

layout/generic/nsImageFrame.cpp

@@ -101,6 +101,7 @@
 #include "nsBidiPresUtils.h"
 
 #include "gfxRect.h"
+#include "ImageLayers.h"
 
 // sizes (pixels) for image icon, padding and border frame
 #define ICON_SIZE        (16)
@@ -114,7 +115,6 @@
 // Default alignment value (so we can tell an unset value from a set value)
 #define ALIGN_UNSET PRUint8(-1)
 
-using namespace mozilla;
 using namespace mozilla::layers;
 
 // static icon information

layout/generic/nsImageFrame.h

@@ -42,18 +42,13 @@
 #define nsImageFrame_h___
 
 #include "nsSplittableFrame.h"
-#include "nsString.h"
-#include "nsAString.h"
 #include "nsIImageFrame.h"
 #include "nsIIOService.h"
 #include "nsIObserver.h"
 
-#include "imgIRequest.h"
 #include "nsStubImageDecoderObserver.h"
 #include "imgIDecoderObserver.h"
 
-#include "Layers.h"
-#include "ImageLayers.h"
 #include "nsDisplayList.h"
 #include "imgIContainer.h"
 
@@ -69,8 +64,13 @@ class nsPresContext;
 class nsImageFrame;
 class nsTransform2D;
 
-using namespace mozilla;
-using namespace mozilla::layers;
+namespace mozilla {
+namespace layers {
+  class ImageContainer;
+  class ImageLayer;
+  class LayerManager;
+}
+}
 
 class nsImageListener : public nsStubImageDecoderObserver
 {
@@ -102,6 +102,10 @@ private:
 
 class nsImageFrame : public ImageFrameSuper, public nsIImageFrame {
 public:
+  typedef mozilla::layers::ImageContainer ImageContainer;
+  typedef mozilla::layers::ImageLayer ImageLayer;
+  typedef mozilla::layers::LayerManager LayerManager;
+
   NS_DECL_FRAMEARENA_HELPERS
 
   nsImageFrame(nsStyleContext* aContext);
@@ -384,6 +388,10 @@ public:
  */
 class nsDisplayImage : public nsDisplayItem {
 public:
+  typedef mozilla::layers::ImageContainer ImageContainer;
+  typedef mozilla::layers::ImageLayer ImageLayer;
+  typedef mozilla::layers::LayerManager LayerManager;
+
   nsDisplayImage(nsDisplayListBuilder* aBuilder, nsImageFrame* aFrame,
                  imgIContainer* aImage)
     : nsDisplayItem(aBuilder, aFrame), mImage(aImage) {