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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/Font.cpp

Issue 2161683002: Add LayoutLocale class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test stability Created 4 years, 4 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
OLDNEW
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 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 m_fontFallbackList, 516 m_fontFallbackList,
517 fallbackPriority); 517 fallbackPriority);
518 } 518 }
519 519
520 GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpa ce, FontDataVariant variant) const 520 GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpa ce, FontDataVariant variant) const
521 { 521 {
522 ASSERT(isMainThread()); 522 ASSERT(isMainThread());
523 523
524 if (variant == AutoVariant) { 524 if (variant == AutoVariant) {
525 if (m_fontDescription.variantCaps() == FontDescription::SmallCaps) { 525 if (m_fontDescription.variantCaps() == FontDescription::SmallCaps) {
526 bool includeDefault = false; 526 UChar32 upperC = toUpper(c, LayoutLocale::localeString(m_fontDescrip tion.locale()));
527 UChar32 upperC = toUpper(c, m_fontDescription.locale(includeDefault) );
528 if (upperC != c) { 527 if (upperC != c) {
529 c = upperC; 528 c = upperC;
530 variant = SmallCapsVariant; 529 variant = SmallCapsVariant;
531 } else { 530 } else {
532 variant = NormalVariant; 531 variant = NormalVariant;
533 } 532 }
534 } else { 533 } else {
535 variant = NormalVariant; 534 variant = NormalVariant;
536 } 535 }
537 } 536 }
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 { 853 {
855 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 854 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
856 } 855 }
857 856
858 bool Font::isFallbackValid() const 857 bool Font::isFallbackValid() const
859 { 858 {
860 return !m_fontFallbackList || m_fontFallbackList->isValid(); 859 return !m_fontFallbackList || m_fontFallbackList->isValid();
861 } 860 }
862 861
863 } // namespace blink 862 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gypi ('k') | third_party/WebKit/Source/platform/fonts/FontCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698