Bug 1554589 - Turn nsCharsetSource constants into an enum. r=hsivonen

Since unscoped enums implicitly convert to underlying types, we don't have to change everything at once. It is worth enough to introduce auto-numbering, IMO.

Differential Revision: https://phabricator.services.mozilla.com/D32841

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Masatoshi Kimura 2019-06-03 09:13:50 +00:00
parent 0a9fe4ff98
commit b411f04b5f

View File

@ -6,24 +6,26 @@
#define nsCharsetSource_h_ #define nsCharsetSource_h_
// note: the value order defines the priority; higher numbers take priority // note: the value order defines the priority; higher numbers take priority
#define kCharsetUninitialized 0 enum {
#define kCharsetFromFallback 1 kCharsetUninitialized,
#define kCharsetFromTopLevelDomain 2 kCharsetFromFallback,
#define kCharsetFromFileURLGuess 3 kCharsetFromTopLevelDomain,
#define kCharsetFromDocTypeDefault 4 // This and up confident for XHR kCharsetFromFileURLGuess,
#define kCharsetFromCache 5 kCharsetFromDocTypeDefault, // This and up confident for XHR
#define kCharsetFromParentFrame 6 kCharsetFromCache,
#define kCharsetFromAutoDetection 7 kCharsetFromParentFrame,
#define kCharsetFromHintPrevDoc 8 kCharsetFromAutoDetection,
#define kCharsetFromMetaPrescan 9 // this one and smaller: HTML5 Tentative kCharsetFromHintPrevDoc,
#define kCharsetFromMetaTag 10 // this one and greater: HTML5 Confident kCharsetFromMetaPrescan, // this one and smaller: HTML5 Tentative
#define kCharsetFromIrreversibleAutoDetection 11 kCharsetFromMetaTag, // this one and greater: HTML5 Confident
#define kCharsetFromChannel 12 kCharsetFromIrreversibleAutoDetection,
#define kCharsetFromOtherComponent 13 kCharsetFromChannel,
#define kCharsetFromParentForced 14 // propagates to child frames kCharsetFromOtherComponent,
#define kCharsetFromUserForced 15 // propagates to child frames kCharsetFromParentForced, // propagates to child frames
#define kCharsetFromByteOrderMark 16 kCharsetFromUserForced, // propagates to child frames
#define kCharsetFromUtf8OnlyMime 17 // For JSON, WebVTT and such kCharsetFromByteOrderMark,
#define kCharsetFromBuiltIn 18 // resource: URLs kCharsetFromUtf8OnlyMime, // For JSON, WebVTT and such
kCharsetFromBuiltIn, // resource: URLs
};
#endif /* nsCharsetSource_h_ */ #endif /* nsCharsetSource_h_ */