Added new font intropsection methods to nsIFontMetrics

gfx/src/mac/nsFontMetricsMac.cpp

@@ -236,6 +236,30 @@ NS_IMETHODIMP nsFontMetricsMac :: Init(const nsFont& aFont, nsIDeviceContext* aC
   mLeading = 0;
 }*/
 
+NS_IMETHODIMP
+nsFontMetricsMac :: GetXHeight(nscoord& aResult)
+{
+//  aResult = mMaxAscent / 2;     // XXX temporary code!
+  aResult = 0;/* XXX */
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsMac :: GetSuperscriptOffset(nscoord& aResult)
+{
+//  aResult = mMaxAscent / 2;     // XXX temporary code!
+  aResult = 0;/* XXX */
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsMac :: GetSubscriptOffset(nscoord& aResult)
+{
+//  aResult = mMaxAscent / 2;     // XXX temporary code!
+  aResult = 0;/* XXX */
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsFontMetricsMac :: GetWidth(char ch, nscoord &aWidth)
 {
   //if (ch < 256)

gfx/src/mac/nsFontMetricsMac.h

@@ -41,6 +41,9 @@ public:
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
   NS_IMETHOD  GetWidth(char aC, nscoord &aWidth);
   NS_IMETHOD  GetWidth(PRUnichar aC, nscoord &aWidth);
   NS_IMETHOD  GetWidth(const nsString& aString, nscoord &aWidth);

gfx/src/motif/nsFontMetricsUnix.cpp

@@ -272,6 +272,27 @@ void nsFontMetricsUnix::RealizeFont()
   mLeading = 0;
 }
 
+NS_IMETHODIMP
+nsFontMetricsUnix :: GetXHeight(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsUnix :: GetSuperscriptOffset(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsUnix :: GetSubscriptOffset(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsFontMetricsUnix :: GetWidth(char ch, nscoord &aWidth)
 {
   char buf[1];

gfx/src/motif/nsFontMetricsUnix.h

@@ -45,6 +45,9 @@ public:
   NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
   NS_IMETHOD  Destroy();
 
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
   NS_IMETHOD  GetWidth(char aC, nscoord &aWidth);
   NS_IMETHOD  GetWidth(PRUnichar aC, nscoord &aWidth);
   NS_IMETHOD  GetWidth(const nsString& aString, nscoord &aWidth);

gfx/src/nsIFontMetrics.h

@@ -61,6 +61,25 @@ public:
    */
   NS_IMETHOD  Destroy() = 0;
 
+  /**
+   * Return the font's xheight property, scaled into app-units.
+   */
+  NS_IMETHOD  GetXHeight(nscoord& aResult) = 0;
+
+  /**
+   * Return the font's superscript offset (the distance from the
+   * baseline to where a superscript's baseline should be placed). The
+   * value returned will be a positive value.
+   */
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult) = 0;
+
+  /**
+   * Return the font's subscript offset (the distance from the
+   * baseline to where a subscript's baseline should be placed). The
+   * value returned will be a positive value.
+   */
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult) = 0;
+
   /**
    * Returns the width (in app units) of an 8-bit character
    */

gfx/src/windows/nsFontMetricsWin.cpp

@@ -233,6 +233,27 @@ nsFontMetricsWin::RealizeFont()
   ::ReleaseDC(win, dc);
 }
 
+NS_IMETHODIMP
+nsFontMetricsWin :: GetXHeight(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsWin :: GetSuperscriptOffset(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFontMetricsWin :: GetSubscriptOffset(nscoord& aResult)
+{
+  aResult = mMaxAscent / 2;     // XXX temporary code!
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsFontMetricsWin :: GetWidth(char ch, nscoord& aWidth)
 {

gfx/src/windows/nsFontMetricsWin.h

@@ -45,6 +45,9 @@ public:
   NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
   NS_IMETHOD  Destroy();
 
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
   NS_IMETHOD  GetWidth(char aC, nscoord& aWidth);
   NS_IMETHOD  GetWidth(PRUnichar aC, nscoord& aWidth);
   NS_IMETHOD  GetWidth(const nsString& aString, nscoord& aWidth);