Commit 15b7adf2 authored by John Daggett's avatar John Daggett
Browse files

Bug 718539. Trim out old featureSettings string code. r=jkew

parent bae4d924

content/canvas/src/nsCanvasRenderingContext2D.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2584,7 +2584,6 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font) 
                       fontStyle->mFont.sizeAdjust,

                       fontStyle->mFont.systemFont,

                       printerFont,

                       fontStyle->mFont.featureSettings,

                       fontStyle->mFont.languageOverride);



    fontStyle->mFont.AddFontFeaturesToStyle(&style);

content/canvas/src/nsCanvasRenderingContext2DAzure.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2797,7 +2797,6 @@ nsCanvasRenderingContext2DAzure::SetFont(const nsAString& font) 
                      fontStyle->mFont.sizeAdjust,

                      fontStyle->mFont.systemFont,

                      printerFont,

                      fontStyle->mFont.featureSettings,

                      fontStyle->mFont.languageOverride);



  fontStyle->mFont.AddFontFeaturesToStyle(&style);

gfx/src/nsFont.cpp

+0 −11
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
nsFont::nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,

               PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,

               nscoord aSize, float aSizeAdjust,

               const nsString* aFeatureSettings,

               const nsString* aLanguageOverride)

{

  NS_ASSERTION(aName && IsASCII(nsDependentCString(aName)),
@@ -58,9 +57,6 @@ nsFont::nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant, 
  decorations = aDecoration;

  size = aSize;

  sizeAdjust = aSizeAdjust;

  if (aFeatureSettings) {

    featureSettings = *aFeatureSettings;

  }

  if (aLanguageOverride) {

    languageOverride = *aLanguageOverride;

  }
@@ -69,7 +65,6 @@ nsFont::nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant, 
nsFont::nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant,

               PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,

               nscoord aSize, float aSizeAdjust,

               const nsString* aFeatureSettings,

               const nsString* aLanguageOverride)

  : name(aName)

{
@@ -81,9 +76,6 @@ nsFont::nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant, 
  decorations = aDecoration;

  size = aSize;

  sizeAdjust = aSizeAdjust;

  if (aFeatureSettings) {

    featureSettings = *aFeatureSettings;

  }

  if (aLanguageOverride) {

    languageOverride = *aLanguageOverride;

  }
@@ -100,7 +92,6 @@ nsFont::nsFont(const nsFont& aOther) 
  decorations = aOther.decorations;

  size = aOther.size;

  sizeAdjust = aOther.sizeAdjust;

  featureSettings = aOther.featureSettings;

  languageOverride = aOther.languageOverride;

  fontFeatureSettings = aOther.fontFeatureSettings;

}
@@ -122,7 +113,6 @@ bool nsFont::BaseEquals(const nsFont& aOther) const 
      (size == aOther.size) &&

      (sizeAdjust == aOther.sizeAdjust) &&

      name.Equals(aOther.name, nsCaseInsensitiveStringComparator()) &&

      (featureSettings == aOther.featureSettings) &&

      (languageOverride == aOther.languageOverride) &&

      (fontFeatureSettings == aOther.fontFeatureSettings)) {

    return true;
@@ -151,7 +141,6 @@ nsFont& nsFont::operator=(const nsFont& aOther) 
  decorations = aOther.decorations;

  size = aOther.size;

  sizeAdjust = aOther.sizeAdjust;

  featureSettings = aOther.featureSettings;

  languageOverride = aOther.languageOverride;

  fontFeatureSettings = aOther.fontFeatureSettings;

  return *this;

gfx/src/nsFont.h

+0 −5
Original line number Diff line number Diff line
@@ -104,9 +104,6 @@ struct NS_GFX nsFont { 
  // Font features from CSS font-feature-settings

  nsTArray<gfxFontFeature> fontFeatureSettings;



  // old-style font-feature-settings (trimmed in later patch)

  nsString featureSettings;



  // Language system tag, to override document language;

  // this is an OpenType "language system" tag represented as a 32-bit integer

  // (see http://www.microsoft.com/typography/otspec/languagetags.htm).
@@ -116,14 +113,12 @@ struct NS_GFX nsFont { 
  nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,

         PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,

         nscoord aSize, float aSizeAdjust=0.0f,

         const nsString* aFeatureSettings = nsnull,

         const nsString* aLanguageOverride = nsnull);



  // Initialize the font struct with a (potentially) unicode name

  nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant,

         PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,

         nscoord aSize, float aSizeAdjust=0.0f,

         const nsString* aFeatureSettings = nsnull,

         const nsString* aLanguageOverride = nsnull);



  // Make a copy of the given font

gfx/src/nsFontMetrics.cpp

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage, 
                       aFont.sizeAdjust,

                       aFont.systemFont,

                       mDeviceContext->IsPrinterSurface(),

                       aFont.featureSettings,

                       aFont.languageOverride);



    aFont.AddFontFeaturesToStyle(&style);