diff --git a/layout/svg/renderer/src/gdiplus/nsSVGGDIPlusGlyphMetrics.cpp b/layout/svg/renderer/src/gdiplus/nsSVGGDIPlusGlyphMetrics.cpp index 6bfd9b679606..159b9a291c77 100644 --- a/layout/svg/renderer/src/gdiplus/nsSVGGDIPlusGlyphMetrics.cpp +++ b/layout/svg/renderer/src/gdiplus/nsSVGGDIPlusGlyphMetrics.cpp @@ -149,7 +149,7 @@ private: nsCOMPtr mSource; public: - static nsDataHashtable sFontAliases; + static nsDataHashtable sFontAliases; }; /** @} */ @@ -157,7 +157,7 @@ public: //---------------------------------------------------------------------- // implementation: -nsDataHashtable +nsDataHashtable nsSVGGDIPlusGlyphMetrics::sFontAliases; nsSVGGDIPlusGlyphMetrics::nsSVGGDIPlusGlyphMetrics(nsISVGGlyphMetricsSource *src) @@ -505,14 +505,14 @@ static PRBool FindFontFamily(const nsString& aFamily, PRBool aGeneric, void *aDa delete family; //try alias if there is one: - const nsDependentString *alias = nsnull; + const nsString *alias = nsnull; nsAutoString canonical_name(aFamily); ToLowerCase(canonical_name); nsSVGGDIPlusGlyphMetrics::sFontAliases.Get(canonical_name, &alias); if (alias) { // XXX this might cause a stack-overflow if there are cyclic // aliases in sFontAliases - retval = FindFontFamily(nsString(*alias), PR_FALSE, aData); + retval = FindFontFamily(*alias, PR_FALSE, aData); } } diff --git a/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp b/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp index acb9917230a6..27384f79124a 100644 --- a/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp +++ b/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp @@ -112,7 +112,7 @@ private: nsCOMPtr mSource; public: - static nsDataHashtable sFontAliases; + static nsDataHashtable sFontAliases; }; /** @} */ @@ -120,7 +120,7 @@ public: //---------------------------------------------------------------------- // nsSVGLibartGlyphMetricsFT implementation: -nsDataHashtable +nsDataHashtable nsSVGLibartGlyphMetricsFT::sFontAliases; @@ -406,7 +406,7 @@ FindFont(const nsString& aFamily, PRBool aGeneric, void *aData) } else { // try alias if there is one: - const nsDependentString *alias = nsnull; + const nsString *alias = nsnull; nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), &alias); if (alias) {