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

Change nsStyleUtil::EscapeCSSString to nsStyleUtil::AppendEscapedCSSString,... 

Change nsStyleUtil::EscapeCSSString to nsStyleUtil::AppendEscapedCSSString, since almost all callers prefer append behavior anyway.  (Bug 478160)  r+sr=bzbarsky
parent 7e6cac3c

layout/style/nsCSSRules.cpp

+7 −15
Original line number Diff line number Diff line
@@ -1504,19 +1504,15 @@ SerializeFontSrc(const nsCSSValue& src, nsAString & aResult NS_OUTPARAM) 
    nsAutoString formats;



    if (sources[i].GetUnit() == eCSSUnit_URL) {

      aResult.AppendLiteral("url(");

      nsDependentString url(sources[i].GetOriginalURLValue());

      nsAutoString escapedUrl;

      nsStyleUtil::EscapeCSSString(url, escapedUrl);

      aResult.AppendLiteral("url(\"");

      aResult.Append(escapedUrl);

      aResult.AppendLiteral("\")");

      nsStyleUtil::AppendEscapedCSSString(url, aResult);

      aResult.AppendLiteral(")");

    } else if (sources[i].GetUnit() == eCSSUnit_Local_Font) {

      aResult.AppendLiteral("local(");

      nsDependentString local(sources[i].GetStringBufferValue());

      nsAutoString escapedLocal;

      nsStyleUtil::EscapeCSSString(local, escapedLocal);

      aResult.AppendLiteral("local(\"");

      aResult.Append(escapedLocal);

      aResult.AppendLiteral("\")");

      nsStyleUtil::AppendEscapedCSSString(local, aResult);

      aResult.AppendLiteral(")");

    } else {

      NS_NOTREACHED("entry in src: descriptor with improper unit");

      i++;
@@ -1585,11 +1581,7 @@ nsCSSFontFaceStyleDecl::GetPropertyValue(nsCSSFontDesc aFontDescID, 
      // canonicalize the way we want, and anyway it's overkill when

      // we know we have eCSSUnit_String

      nsDependentString family(val.GetStringBufferValue());

      nsAutoString escapedFamily;

      nsStyleUtil::EscapeCSSString(family, escapedFamily);

      aResult.Append('"');

      aResult.Append(escapedFamily);

      aResult.Append('"');

      nsStyleUtil::AppendEscapedCSSString(family, aResult);

      return NS_OK;

    }

layout/style/nsCSSStyleRule.cpp

+1 −6
Original line number Diff line number Diff line
@@ -673,12 +673,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations 
        aString.Append(PRUnichar('='));

      

        // Append the value

        nsAutoString escaped;

        nsStyleUtil::EscapeCSSString(list->mValue, escaped);

      

        aString.Append(PRUnichar('\"'));

        aString.Append(escaped);

        aString.Append(PRUnichar('\"'));

        nsStyleUtil::AppendEscapedCSSString(list->mValue, aString);

      }



      aString.Append(PRUnichar(']'));

layout/style/nsComputedDOMStyle.cpp

+8 −16
Original line number Diff line number Diff line
@@ -711,10 +711,8 @@ nsComputedDOMStyle::GetContent(nsIDOMCSSValue** aValue) 
      case eStyleContentType_String:

        {

          nsString str;

          nsStyleUtil::EscapeCSSString(nsDependentString(data.mContent.mString),

                                       str);

          str.Insert(PRUnichar('"'), 0);

          str.Append(PRUnichar('"'));

          nsStyleUtil::AppendEscapedCSSString(

            nsDependentString(data.mContent.mString), str);

          val->SetString(str);

        }

        break;
@@ -749,12 +747,9 @@ nsComputedDOMStyle::GetContent(nsIDOMCSSValue** aValue) 
          PRInt32 typeItem = 1;

          if (data.mType == eStyleContentType_Counters) {

            typeItem = 2;

            str.AppendLiteral(", \"");

            nsString itemstr;

            nsStyleUtil::EscapeCSSString(

              nsDependentString(a->Item(1).GetStringBufferValue()), itemstr);

            str.Append(itemstr);

            str.Append(PRUnichar('"'));

            str.AppendLiteral(", ");

            nsStyleUtil::AppendEscapedCSSString(

              nsDependentString(a->Item(1).GetStringBufferValue()), str);

          }

          PRInt32 type = a->Item(typeItem).GetIntValue();

          if (type != NS_STYLE_LIST_STYLE_DECIMAL) {
@@ -1009,13 +1004,10 @@ nsComputedDOMStyle::GetQuotes(nsIDOMCSSValue** aValue) 
    }



    nsString s;

    nsStyleUtil::EscapeCSSString(*quotes->OpenQuoteAt(i), s);

    s.Insert(PRUnichar('"'), 0);

    s.Append(PRUnichar('"'));

    nsStyleUtil::AppendEscapedCSSString(*quotes->OpenQuoteAt(i), s);

    openVal->SetString(s);

    nsStyleUtil::EscapeCSSString(*quotes->CloseQuoteAt(i), s);

    s.Insert(PRUnichar('"'), 0);

    s.Append(PRUnichar('"'));

    s.Truncate();

    nsStyleUtil::AppendEscapedCSSString(*quotes->CloseQuoteAt(i), s);

    closeVal->SetString(s);

  }

layout/style/nsStyleUtil.cpp

+5 −2
Original line number Diff line number Diff line
@@ -538,9 +538,10 @@ PRBool nsStyleUtil::DashMatchCompare(const nsAString& aAttributeValue, 
  return result;

}



void nsStyleUtil::EscapeCSSString(const nsString& aString, nsAString& aReturn)

void nsStyleUtil::AppendEscapedCSSString(const nsString& aString,

                                         nsAString& aReturn)

{

  aReturn.Truncate();

  aReturn.Append(PRUnichar('"'));



  const nsString::char_type* in = aString.get();

  const nsString::char_type* const end = in + aString.Length();
@@ -570,6 +571,8 @@ void nsStyleUtil::EscapeCSSString(const nsString& aString, nsAString& aReturn) 
       aReturn.Append(PRUnichar(*in));

    }

  }



  aReturn.Append(PRUnichar('"'));

}



/* static */ float

layout/style/nsStyleUtil.h

+3 −1
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ public: 
                                const nsAString& aSelectorValue,

                                const nsStringComparator& aComparator);

                                

  static void EscapeCSSString(const nsString& aString, nsAString& aReturn);

  // Append a quoted (with "") and escaped version of aString to aResult.

  static void AppendEscapedCSSString(const nsString& aString,

                                     nsAString& aResult);



  /*

   * Convert an author-provided floating point number to an integer (0