OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 Google Inc. All rights reserved. | 2 * Copyright (c) 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2013 BlackBerry Limited. All rights reserved. | 3 * Copyright (C) 2013 BlackBerry Limited. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 m_font->getFontDescription().orientation(), | 637 m_font->getFontDescription().orientation(), |
638 segmentRange.renderOrientation); | 638 segmentRange.renderOrientation); |
639 | 639 |
640 CaseMapIntend caseMapIntend = CaseMapIntend::KeepSameCase; | 640 CaseMapIntend caseMapIntend = CaseMapIntend::KeepSameCase; |
641 if (needsCapsHandling) { | 641 if (needsCapsHandling) { |
642 caseMapIntend = capsSupport.needsCaseChange(smallCapsBehavior); | 642 caseMapIntend = capsSupport.needsCaseChange(smallCapsBehavior); |
643 } | 643 } |
644 | 644 |
645 CaseMappingHarfBuzzBufferFiller( | 645 CaseMappingHarfBuzzBufferFiller( |
646 caseMapIntend, | 646 caseMapIntend, |
| 647 fontDescription.locale(), |
647 harfBuzzBuffer.get(), | 648 harfBuzzBuffer.get(), |
648 m_normalizedBuffer.get(), | 649 m_normalizedBuffer.get(), |
649 m_normalizedBufferLength, | 650 m_normalizedBufferLength, |
650 currentQueueItem.m_startIndex, | 651 currentQueueItem.m_startIndex, |
651 currentQueueItem.m_numCharacters); | 652 currentQueueItem.m_numCharacters); |
652 | 653 |
653 CapsFeatureSettingsScopedOverlay capsOverlay(m_features, capsSupport
.fontFeatureToUse(smallCapsBehavior)); | 654 CapsFeatureSettingsScopedOverlay capsOverlay(m_features, capsSupport
.fontFeatureToUse(smallCapsBehavior)); |
654 | 655 |
655 if (!shapeRange(harfBuzzBuffer.get(), | 656 if (!shapeRange(harfBuzzBuffer.get(), |
656 currentQueueItem.m_startIndex, | 657 currentQueueItem.m_startIndex, |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
698 result->m_width = run->m_width; | 699 result->m_width = run->m_width; |
699 result->m_numGlyphs = count; | 700 result->m_numGlyphs = count; |
700 ASSERT(result->m_numGlyphs == count); // no overflow | 701 ASSERT(result->m_numGlyphs == count); // no overflow |
701 result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright
(); | 702 result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright
(); |
702 result->m_runs.append(std::move(run)); | 703 result->m_runs.append(std::move(run)); |
703 return result.release(); | 704 return result.release(); |
704 } | 705 } |
705 | 706 |
706 | 707 |
707 } // namespace blink | 708 } // namespace blink |
OLD | NEW |