| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 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 15 matching lines...) Expand all Loading... |
| 26 #ifndef FontOrientation_h | 26 #ifndef FontOrientation_h |
| 27 #define FontOrientation_h | 27 #define FontOrientation_h |
| 28 | 28 |
| 29 #include "platform/text/Character.h" | 29 #include "platform/text/Character.h" |
| 30 | 30 |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 enum class FontOrientation { | 33 enum class FontOrientation { |
| 34 // Horizontal; i.e., writing-mode: horizontal-tb | 34 // Horizontal; i.e., writing-mode: horizontal-tb |
| 35 Horizontal = 0, | 35 Horizontal = 0, |
| 36 // Baseline is vertical but use rotated horizontal typography; i.e., writing-m
ode: vertical-*; text-orientation: sideways-* | 36 // Baseline is vertical but use rotated horizontal typography; |
| 37 // i.e., writing-mode: vertical-*; text-orientation: sideways-* |
| 37 VerticalRotated = 1, | 38 VerticalRotated = 1, |
| 38 // Vertical with upright CJK and rotated non-CJK; i.e., writing-mode: vertical
-*, text-orientation: mixed | 39 // Vertical with upright CJK and rotated non-CJK; |
| 40 // i.e., writing-mode: vertical-*, text-orientation: mixed |
| 39 VerticalMixed = 2, | 41 VerticalMixed = 2, |
| 40 // Vertical with all upright; i.e., writing-mode: vertical-*, text-orientation
: upright | 42 // Vertical with all upright; |
| 43 // i.e., writing-mode: vertical-*, text-orientation: upright |
| 41 VerticalUpright = 3, | 44 VerticalUpright = 3, |
| 42 | 45 |
| 43 BitCount = 2, | 46 BitCount = 2, |
| 44 | 47 |
| 45 AnyUprightMask = 2, | 48 AnyUprightMask = 2, |
| 46 }; | 49 }; |
| 47 | 50 |
| 48 inline bool operator&(FontOrientation value, FontOrientation mask) { | 51 inline bool operator&(FontOrientation value, FontOrientation mask) { |
| 49 return static_cast<unsigned>(value) & static_cast<unsigned>(mask); | 52 return static_cast<unsigned>(value) & static_cast<unsigned>(mask); |
| 50 } | 53 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 69 if (orientation != FontOrientation::VerticalMixed) | 72 if (orientation != FontOrientation::VerticalMixed) |
| 70 return orientation; | 73 return orientation; |
| 71 return Character::isUprightInMixedVertical(character) | 74 return Character::isUprightInMixedVertical(character) |
| 72 ? FontOrientation::VerticalUpright | 75 ? FontOrientation::VerticalUpright |
| 73 : FontOrientation::VerticalRotated; | 76 : FontOrientation::VerticalRotated; |
| 74 } | 77 } |
| 75 | 78 |
| 76 } // namespace blink | 79 } // namespace blink |
| 77 | 80 |
| 78 #endif // FontOrientation_h | 81 #endif // FontOrientation_h |
| OLD | NEW |