Backed out changeset 4d6aa78bf59d (bug 1460858) for Android mochitest failures on test_font_whitelist.html. CLOSED TREE

gfx/src/FontPropertyTypes.h

@@ -347,9 +347,8 @@ public:
         return Oblique(angle);
       }
       // Not recognized as an oblique angle; maybe it's from a startup-cache
-      // created by an older version. The style field there used a simple 0/1
-      // for normal/italic respectively.
-      return aString[0] == '0' ? Normal() : Italic();
+      // created by an older version. Just treat it as 'normal'.      
+      return Normal();
     }
   }
 

gfx/thebes/gfxFT2FontList.cpp

@@ -1060,11 +1060,7 @@ AppendToFaceList(nsCString& aFaceList,
     aFaceList.Append(',');
     aFaceList.AppendInt(aFontEntry->mFTFontIndex);
     aFaceList.Append(',');
-    // Note that ToString() appends to the destination string without
-    // replacing existing contents (see FontPropertyTypes.h)
-    aFontEntry->SlantStyle().Min().ToString(aFaceList);
-    aFaceList.Append(':');
-    aFontEntry->SlantStyle().Max().ToString(aFaceList);
+    aFaceList.Append(aFontEntry->IsItalic() ? '1' : '0');
     aFaceList.Append(',');
     aFaceList.AppendFloat(aFontEntry->Weight().Min().ToFloat());
     aFaceList.Append(':');