Source/platform/fonts/FontTraitsMask.h - Issue 183813005: Add font-stretch to FontDescription

Side by Side Diff: Source/platform/fonts/FontTraitsMask.h

Issue 183813005: Add font-stretch to FontDescription (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.	2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 24 matching lines...) Expand all Loading...
35 FontVariantSmallCapsBit,	35 FontVariantSmallCapsBit,

36 FontWeight100Bit,	36 FontWeight100Bit,

37 FontWeight200Bit,	37 FontWeight200Bit,

38 FontWeight300Bit,	38 FontWeight300Bit,

39 FontWeight400Bit,	39 FontWeight400Bit,

40 FontWeight500Bit,	40 FontWeight500Bit,

41 FontWeight600Bit,	41 FontWeight600Bit,

42 FontWeight700Bit,	42 FontWeight700Bit,

43 FontWeight800Bit,	43 FontWeight800Bit,

44 FontWeight900Bit,	44 FontWeight900Bit,

	45 FontStretchBit1,

	46 FontStretchBit2,

	47 FontStretchBit3,

	48 FontStretchBit4,

45 FontTraitsMaskWidth	49 FontTraitsMaskWidth

46 };	50 };

47	51

48 enum FontTraitsMask {	52 enum FontTraitsMask {

49 FontStyleNormalMask = 1 << FontStyleNormalBit,	53 FontStyleNormalMask = 1 << FontStyleNormalBit,

50 FontStyleItalicMask = 1 << FontStyleItalicBit,	54 FontStyleItalicMask = 1 << FontStyleItalicBit,

51 FontStyleMask = FontStyleNormalMask \| FontStyleItalicMask,	55 FontStyleMask = FontStyleNormalMask \| FontStyleItalicMask,

52	56

53 FontVariantNormalMask = 1 << FontVariantNormalBit,	57 FontVariantNormalMask = 1 << FontVariantNormalBit,

54 FontVariantSmallCapsMask = 1 << FontVariantSmallCapsBit,	58 FontVariantSmallCapsMask = 1 << FontVariantSmallCapsBit,

55 FontVariantMask = FontVariantNormalMask \| FontVariantSmallCapsMask,	59 FontVariantMask = FontVariantNormalMask \| FontVariantSmallCapsMask,

56	60

57 FontWeight100Mask = 1 << FontWeight100Bit,	61 FontWeight100Mask = 1 << FontWeight100Bit,

58 FontWeight200Mask = 1 << FontWeight200Bit,	62 FontWeight200Mask = 1 << FontWeight200Bit,

59 FontWeight300Mask = 1 << FontWeight300Bit,	63 FontWeight300Mask = 1 << FontWeight300Bit,

60 FontWeight400Mask = 1 << FontWeight400Bit,	64 FontWeight400Mask = 1 << FontWeight400Bit,

61 FontWeight500Mask = 1 << FontWeight500Bit,	65 FontWeight500Mask = 1 << FontWeight500Bit,

62 FontWeight600Mask = 1 << FontWeight600Bit,	66 FontWeight600Mask = 1 << FontWeight600Bit,

63 FontWeight700Mask = 1 << FontWeight700Bit,	67 FontWeight700Mask = 1 << FontWeight700Bit,

64 FontWeight800Mask = 1 << FontWeight800Bit,	68 FontWeight800Mask = 1 << FontWeight800Bit,

65 FontWeight900Mask = 1 << FontWeight900Bit,	69 FontWeight900Mask = 1 << FontWeight900Bit,

66 FontWeightMask = FontWeight100Mask \| FontWeight200Mask \| FontWeight300Mask \| FontWeight400Mask \| FontWeight500Mask \| FontWeight600Mask \| FontWeight700Mask \| FontWeight800Mask \| FontWeight900Mask	70 FontWeightMask = FontWeight100Mask \| FontWeight200Mask \| FontWeight300Mask \| FontWeight400Mask \| FontWeight500Mask \| FontWeight600Mask \| FontWeight700Mask \| FontWeight800Mask \| FontWeight900Mask,
	eseidel 2014/03/04 02:11:26 Why are these stored this way if you can only have Why are these stored this way if you can only have one at at time?
	71 FontStretchBit1Mask = 1 << FontStretchBit1,
	eseidel 2014/03/04 08:58:27 Why have separate constants for these? Why not ju Why have separate constants for these? Why not just 0b1111 for the mask? Maybe binary literals are GCC only? 0xF is slightly less clear, but identical too. :)
	72 FontStretchBit2Mask = 1 << FontStretchBit2,

	73 FontStretchBit3Mask = 1 << FontStretchBit3,

	74 FontStretchBit4Mask = 1 << FontStretchBit4,

	75 FontStretchMask = FontStretchBit1Mask \| FontStretchBit2Mask \| FontStretchBit 3Mask \| FontStretchBit4Mask

67 };	76 };

68	77

69 } // namespace WebCore	78 } // namespace WebCore

70 #endif // FontTraitsMask_h	79 #endif // FontTraitsMask_h

OLD	NEW

« no previous file with comments | « Source/platform/fonts/FontDescriptionTest.cpp ('k') | no next file » | no next file with comments »