From eecc00c1140af081d77dce5f222193c78a80d868 Mon Sep 17 00:00:00 2001
From: Arnaud Sourioux <six.dsn@gmail.com>
Date: Wed, 19 Feb 2014 00:21:56 -0800
Subject: [PATCH] Bug 973805 part 1: Change #define classA classB to typedef
 classB classA, in some frame classes. r=dholbert

---
 layout/forms/nsImageControlFrame.cpp | 2 +-
 layout/generic/nsBlockFrame.h        | 2 +-
 layout/generic/nsImageFrame.h        | 2 +-
 layout/generic/nsObjectFrame.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index c594e78b81b..1630ea84d53 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -22,7 +22,7 @@ IntPointDtorFunc(void *aObject, nsIAtom *aPropertyName,
 }
 
 
-#define nsImageControlFrameSuper nsImageFrame
+typedef nsImageFrame nsImageControlFrameSuper;
 class nsImageControlFrame : public nsImageControlFrameSuper,
                             public nsIFormControlFrame
 {
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index f29777654a2..2087b3f8876 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -70,7 +70,7 @@ class nsFirstLineFrame;
  * prepended to the overflow lines.
  */
 
-#define nsBlockFrameSuper nsContainerFrame
+typedef nsContainerFrame nsBlockFrameSuper;
 
 /*
  * Base class for block and inline frames.
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index 257e645678b..dfc79d14d39 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -54,7 +54,7 @@ private:
   nsImageFrame *mFrame;
 };
 
-#define ImageFrameSuper nsSplittableFrame
+typedef nsSplittableFrame ImageFrameSuper;
 
 class nsImageFrame : public ImageFrameSuper,
                      public nsIReflowCallback {
diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h
index 93635f52961..01bd0000656 100644
--- a/layout/generic/nsObjectFrame.h
+++ b/layout/generic/nsObjectFrame.h
@@ -34,7 +34,7 @@ class LayerManager;
 }
 }
 
-#define nsObjectFrameSuper nsFrame
+typedef nsFrame nsObjectFrameSuper;
 
 class nsObjectFrame : public nsObjectFrameSuper,
                       public nsIObjectFrame,