Catching up with recent changes in layout

layout/mathml/base/src/nsMathMLChar.h

@@ -50,7 +50,7 @@ struct nsCharMetrics {
     descent = aCharMetrics.descent;
   }
 
-  nsCharMetrics(const nsReflowMetrics& aReflowMetrics) {
+  nsCharMetrics(const nsHTMLReflowMetrics& aReflowMetrics) {
     width = aReflowMetrics.width; 
     height = aReflowMetrics.height;
     ascent = aReflowMetrics.ascent; 

layout/mathml/base/src/nsMathMLContainerFrame.cpp

@@ -355,7 +355,7 @@ nsMathMLContainerFrame::SetInitialChildList(nsIPresContext& aPresContext,
       if (inlineFrame) {
         // create a new anonymous block frame to wrap this child...
         nsIFrame* anonymous;
-        rv = NS_NewAnonymousBlockFrame(&anonymous);
+        rv = NS_NewBlockFrame(&anonymous);
         if (NS_FAILED(rv))
           return rv;    
         nsCOMPtr<nsIStyleContext> newStyleContext;