Commit aafe2d42 authored by L. David Baron's avatar L. David Baron
Browse files

Split eCSSUnit_String into eCSSUnit_String (with quotes), eCSSUnit_Ident... 

Split eCSSUnit_String into eCSSUnit_String (with quotes), eCSSUnit_Ident (without quotes), and eCSSUnit_Families (font family list, but not for @font-face descriptor where the single family is stored as eCSSUnit_String).  (Bug 481591)  r+sr=bzbarsky
parent 9ac278df

content/html/content/src/nsGenericHTMLElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ nsGenericHTMLElement::MapCommonAttributesInto(const nsMappedAttributes* aAttribu 
    const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::lang);

    if (value && value->Type() == nsAttrValue::eString) {

      aData->mDisplayData->mLang.SetStringValue(value->GetStringValue(),

                                                eCSSUnit_String);

                                                eCSSUnit_Ident);

    }

  }

}

content/html/content/src/nsHTMLFontElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ MapAttributesIntoRule(const nsMappedAttributes* aAttributes, 
      const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::face);

      if (value && value->Type() == nsAttrValue::eString &&

          !value->IsEmptyString()) {

        font.mFamily.SetStringValue(value->GetStringValue(), eCSSUnit_String);

        font.mFamily.SetStringValue(value->GetStringValue(), eCSSUnit_Families);

        font.mFamilyFromHTML = PR_TRUE;

      }

    }

content/html/content/src/nsHTMLPreElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ MapAttributesIntoRule(const nsMappedAttributes* aAttributes, 
    // variable

    if (aAttributes->GetAttr(nsGkAtoms::variable))

      aData->mFontData->mFamily.SetStringValue(NS_LITERAL_STRING("serif"),

                                               eCSSUnit_String);

                                               eCSSUnit_Families);

  }

  if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Position)) {

    if (aData->mPositionData->mWidth.GetUnit() == eCSSUnit_Null) {

content/mathml/content/src/nsMathMLElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ nsMathMLElement::MapMathMLAttributesInto(const nsMappedAttributes* aAttributes, 
    if (value && value->Type() == nsAttrValue::eString &&

        aData->mFontData->mFamily.GetUnit() == eCSSUnit_Null) {

      aData->mFontData->mFamily.SetStringValue(value->GetStringValue(),

                                               eCSSUnit_String);

                                               eCSSUnit_Families);

      aData->mFontData->mFamilyFromHTML = PR_FALSE;

    }

  }

layout/base/nsPresContext.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1646,7 +1646,6 @@ InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet, 
  unit = val.GetUnit();

  if (unit == eCSSUnit_String) {

    val.GetStringValue(fontfamily);

    fontfamily.Trim("\"");

  } else {

    NS_ASSERTION(unit == eCSSUnit_Null,

                 "@font-face family name has unexpected unit");