Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

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

Issue 1206883002: Fix default text orientation that do not conform Unicode Technical Report #50 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef FontOrientation_h 26 #ifndef FontOrientation_h
27 #define FontOrientation_h 27 #define FontOrientation_h
28 28
29 #include "platform/fonts/Character.h"
30
29 namespace blink { 31 namespace blink {
30 32
31 enum class FontOrientation { 33 enum class FontOrientation {
32 // Horizontal; i.e., writing-mode: horizontal-tb 34 // Horizontal; i.e., writing-mode: horizontal-tb
33 Horizontal = 0, 35 Horizontal = 0,
34 // Baseline is vertical but use rotated horizontal typography; i.e., writing -mode: vertical-*; text-orientation: sideways-* 36 // Baseline is vertical but use rotated horizontal typography; i.e., writing -mode: vertical-*; text-orientation: sideways-*
35 VerticalRotated = 1, 37 VerticalRotated = 1,
36 // Vertical with upright CJK and rotated non-CJK; i.e., writing-mode: vertic al-*, text-orientation: mixed 38 // Vertical with upright CJK and rotated non-CJK; i.e., writing-mode: vertic al-*, text-orientation: mixed
37 VerticalMixed = 2, 39 VerticalMixed = 2,
38 // Vertical with all upright; i.e., writing-mode: vertical-*, text-orientati on: upright 40 // Vertical with all upright; i.e., writing-mode: vertical-*, text-orientati on: upright
39 VerticalUpright = 3, 41 VerticalUpright = 3,
40 42
41 BitCount = 2, 43 BitCount = 2,
42 44
43 AnyUprightMask = 2, 45 AnyUprightMask = 2,
44 }; 46 };
45 47
46 inline bool operator&(FontOrientation value, FontOrientation mask) { return stat ic_cast<unsigned>(value) & static_cast<unsigned>(mask); } 48 inline bool operator&(FontOrientation value, FontOrientation mask) { return stat ic_cast<unsigned>(value) & static_cast<unsigned>(mask); }
47 inline bool isVerticalAnyUpright(FontOrientation orientation) { return orientati on & FontOrientation::AnyUprightMask; } 49 inline bool isVerticalAnyUpright(FontOrientation orientation) { return orientati on & FontOrientation::AnyUprightMask; }
48 inline bool isVerticalNonCJKUpright(FontOrientation orientation) { return orient ation == FontOrientation::VerticalUpright; } 50 inline bool isVerticalNonCJKUpright(FontOrientation orientation) { return orient ation == FontOrientation::VerticalUpright; }
51 inline bool isVerticalUpright(FontOrientation orientation, UChar32 character)
52 {
53 return orientation == FontOrientation::VerticalUpright
54 || (orientation == FontOrientation::VerticalMixed && Character::isUprigh tInMixedVertical(character));
55 }
49 inline bool isVerticalBaseline(FontOrientation orientation) { return orientation != FontOrientation::Horizontal; } 56 inline bool isVerticalBaseline(FontOrientation orientation) { return orientation != FontOrientation::Horizontal; }
50 57
51 } // namespace blink 58 } // namespace blink
52 59
53 #endif // FontOrientation_h 60 #endif // FontOrientation_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698