OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 } | 389 } |
390 } | 390 } |
391 return make_pair(data, page); | 391 return make_pair(data, page); |
392 } | 392 } |
393 | 393 |
394 std::pair<GlyphData, GlyphPage*> Font::glyphDataAndPageForCharacter(UChar32 c, b
ool mirror, FontDataVariant variant) const | 394 std::pair<GlyphData, GlyphPage*> Font::glyphDataAndPageForCharacter(UChar32 c, b
ool mirror, FontDataVariant variant) const |
395 { | 395 { |
396 ASSERT(isMainThread()); | 396 ASSERT(isMainThread()); |
397 | 397 |
398 if (variant == AutoVariant) { | 398 if (variant == AutoVariant) { |
399 if (m_fontDescription.variant() && !primaryFont()->isSVGFont()) { | 399 if (m_fontDescription.variant() == FontVariantSmallCaps && !primaryFont(
)->isSVGFont()) { |
400 UChar32 upperC = toUpper(c); | 400 UChar32 upperC = toUpper(c); |
401 if (upperC != c) { | 401 if (upperC != c) { |
402 c = upperC; | 402 c = upperC; |
403 variant = SmallCapsVariant; | 403 variant = SmallCapsVariant; |
404 } else { | 404 } else { |
405 variant = NormalVariant; | 405 variant = NormalVariant; |
406 } | 406 } |
407 } else { | 407 } else { |
408 variant = NormalVariant; | 408 variant = NormalVariant; |
409 } | 409 } |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 if (delta <= 0) | 851 if (delta <= 0) |
852 break; | 852 break; |
853 } | 853 } |
854 } | 854 } |
855 } | 855 } |
856 | 856 |
857 return offset; | 857 return offset; |
858 } | 858 } |
859 | 859 |
860 } | 860 } |
OLD | NEW |