Backed out changeset 37683ae1953f (bug 1031199) for crashtest bustage on Linux Opt on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 09 Jul 2014 13:44:42 +0200
changeset 193083 0294fdaef9bedc8d9c5d4c333822dc0bf33fb0e0
parent 193082 eac59b675d0eb8c09f73b101617a435b8eae1711
child 193084 cafd55ca929b01761aa4c7500676511ad674f8e7
push id27107
push userryanvm@gmail.com
push dateWed, 09 Jul 2014 19:45:31 +0000
treeherdermozilla-central@6db315bcdb6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1031199
milestone33.0a1
backs out37683ae1953f82ffe17fbfedc3ce66742d866eea
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 37683ae1953f (bug 1031199) for crashtest bustage on Linux Opt on a CLOSED TREE
layout/style/nsFontFaceLoader.cpp
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -574,17 +574,17 @@ nsUserFontSet::InsertRule(nsCSSFontFaceR
   uint32_t languageOverride = NO_FONT_LANGUAGE_OVERRIDE;
 
   // set up weight
   aRule->GetDesc(eCSSFontDesc_Weight, val);
   unit = val.GetUnit();
   if (unit == eCSSUnit_Integer || unit == eCSSUnit_Enumerated) {
     weight = val.GetIntValue();
     if (weight == 0) {
-      weight = NS_STYLE_FONT_WEIGHT_NORMAL;
+      weight = NS_STYLE_FONT_STYLE_NORMAL;
     }
   } else if (unit == eCSSUnit_Normal) {
     weight = NS_STYLE_FONT_WEIGHT_NORMAL;
   } else {
     NS_ASSERTION(unit == eCSSUnit_Null,
                  "@font-face weight has unexpected unit");
   }