bug 88509 - moving of a GetFrameType and layoutAtom from ifdef bidi land.

r=dbaron sr=sfraser

content/shared/public/nsLayoutAtomList.h

@@ -94,6 +94,7 @@ LAYOUT_ATOM(imageFrame, "ImageFrame")
 LAYOUT_ATOM(inlineFrame, "InlineFrame")
 LAYOUT_ATOM(letterFrame, "LetterFrame")
 LAYOUT_ATOM(lineFrame, "LineFrame")
+LAYOUT_ATOM(listControlFrame,"ListControlFrame")
 LAYOUT_ATOM(objectFrame, "ObjectFrame")
 LAYOUT_ATOM(pageFrame, "PageFrame")
 LAYOUT_ATOM(placeholderFrame, "PlaceholderFrame")
@@ -185,7 +186,6 @@ LAYOUT_ATOM(mozdirty, "_moz_dirty")
 
 #ifdef IBMBIDI
 LAYOUT_ATOM(directionalFrame, "DirectionalFrame")
-LAYOUT_ATOM(listControlFrame,"ListControlFrame")
 LAYOUT_ATOM(baseLevel, "BaseLevel")                            // PRUint8
 LAYOUT_ATOM(embeddingLevel, "EmbeddingLevel")                  // PRUint8
 LAYOUT_ATOM(endsInDiacritic, "EndsInDiacritic")                // PRUint32

layout/base/nsLayoutAtomList.h

@@ -94,6 +94,7 @@ LAYOUT_ATOM(imageFrame, "ImageFrame")
 LAYOUT_ATOM(inlineFrame, "InlineFrame")
 LAYOUT_ATOM(letterFrame, "LetterFrame")
 LAYOUT_ATOM(lineFrame, "LineFrame")
+LAYOUT_ATOM(listControlFrame,"ListControlFrame")
 LAYOUT_ATOM(objectFrame, "ObjectFrame")
 LAYOUT_ATOM(pageFrame, "PageFrame")
 LAYOUT_ATOM(placeholderFrame, "PlaceholderFrame")
@@ -185,7 +186,6 @@ LAYOUT_ATOM(mozdirty, "_moz_dirty")
 
 #ifdef IBMBIDI
 LAYOUT_ATOM(directionalFrame, "DirectionalFrame")
-LAYOUT_ATOM(listControlFrame,"ListControlFrame")
 LAYOUT_ATOM(baseLevel, "BaseLevel")                            // PRUint8
 LAYOUT_ATOM(embeddingLevel, "EmbeddingLevel")                  // PRUint8
 LAYOUT_ATOM(endsInDiacritic, "EndsInDiacritic")                // PRUint32

layout/forms/nsListControlFrame.cpp

@@ -3202,7 +3202,6 @@ NS_IMETHODIMP nsListControlFrame::MoveTo(nsIPresContext* aPresContext, nscoord a
   }
 }
 
-#ifdef IBMBIDI
 NS_IMETHODIMP
 nsListControlFrame::GetFrameType(nsIAtom** aType) const
 {
@@ -3211,7 +3210,6 @@ nsListControlFrame::GetFrameType(nsIAtom** aType) const
   NS_ADDREF(*aType);
   return NS_OK;
 }
-#endif // IBMBIDI
 
 //---------------------------------------------------------
 NS_IMETHODIMP 

layout/forms/nsListControlFrame.h

@@ -199,14 +199,12 @@ public:
                    const nsRect& aDirtyRect,
                    nsFramePaintLayer aWhichLayer);
 
-#ifdef IBMBIDI
   /**
    * Get the "type" of the frame
    *
    * @see nsLayoutAtoms::scrollFrame
    */
   NS_IMETHOD GetFrameType(nsIAtom** aType) const;
-#endif // IBMBIDI
 
     // nsIFormControlFrame
   NS_IMETHOD GetType(PRInt32* aType) const;

layout/html/forms/src/nsListControlFrame.cpp

@@ -3202,7 +3202,6 @@ NS_IMETHODIMP nsListControlFrame::MoveTo(nsIPresContext* aPresContext, nscoord a
   }
 }
 
-#ifdef IBMBIDI
 NS_IMETHODIMP
 nsListControlFrame::GetFrameType(nsIAtom** aType) const
 {
@@ -3211,7 +3210,6 @@ nsListControlFrame::GetFrameType(nsIAtom** aType) const
   NS_ADDREF(*aType);
   return NS_OK;
 }
-#endif // IBMBIDI
 
 //---------------------------------------------------------
 NS_IMETHODIMP 

layout/html/forms/src/nsListControlFrame.h

@@ -199,14 +199,12 @@ public:
                    const nsRect& aDirtyRect,
                    nsFramePaintLayer aWhichLayer);
 
-#ifdef IBMBIDI
   /**
    * Get the "type" of the frame
    *
    * @see nsLayoutAtoms::scrollFrame
    */
   NS_IMETHOD GetFrameType(nsIAtom** aType) const;
-#endif // IBMBIDI
 
     // nsIFormControlFrame
   NS_IMETHOD GetType(PRInt32* aType) const;