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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 if (variantCaps == FontDescription::Unicase) { | 535 if (variantCaps == FontDescription::Unicase) { |
536 prependCounting(unic); | 536 prependCounting(unic); |
537 } | 537 } |
538 if (variantCaps == FontDescription::TitlingCaps) { | 538 if (variantCaps == FontDescription::TitlingCaps) { |
539 prependCounting(titl); | 539 prependCounting(titl); |
540 } | 540 } |
541 } | 541 } |
542 | 542 |
543 void CapsFeatureSettingsScopedOverlay::prependCounting( | 543 void CapsFeatureSettingsScopedOverlay::prependCounting( |
544 const hb_feature_t& feature) { | 544 const hb_feature_t& feature) { |
545 m_features->prepend(feature); | 545 m_features->push_front(feature); |
546 m_countFeatures++; | 546 m_countFeatures++; |
547 } | 547 } |
548 | 548 |
549 CapsFeatureSettingsScopedOverlay::~CapsFeatureSettingsScopedOverlay() { | 549 CapsFeatureSettingsScopedOverlay::~CapsFeatureSettingsScopedOverlay() { |
550 m_features->remove(0, m_countFeatures); | 550 m_features->remove(0, m_countFeatures); |
551 } | 551 } |
552 | 552 |
553 } // namespace | 553 } // namespace |
554 | 554 |
555 void HarfBuzzShaper::shapeSegment(RangeData* rangeData, | 555 void HarfBuzzShaper::shapeSegment(RangeData* rangeData, |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
702 shapeSegment(&rangeData, segmentRange, result.get()); | 702 shapeSegment(&rangeData, segmentRange, result.get()); |
703 } | 703 } |
704 return result.release(); | 704 return result.release(); |
705 } | 705 } |
706 | 706 |
707 PassRefPtr<ShapeResult> HarfBuzzShaper::shape(const Font* font, | 707 PassRefPtr<ShapeResult> HarfBuzzShaper::shape(const Font* font, |
708 TextDirection direction) const { | 708 TextDirection direction) const { |
709 return shape(font, direction, 0, m_textLength); | 709 return shape(font, direction, 0, m_textLength); |
710 } | 710 } |
711 } // namespace blink | 711 } // namespace blink |
OLD | NEW |