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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 range_data.start = start; | 706 range_data.start = start; |
707 range_data.end = end; | 707 range_data.end = end; |
708 SetFontFeatures(font, &range_data.font_features); | 708 SetFontFeatures(font, &range_data.font_features); |
709 | 709 |
710 while (run_segmenter.Consume(&segment_range)) { | 710 while (run_segmenter.Consume(&segment_range)) { |
711 // Only shape segments overlapping with the range indicated by start and | 711 // Only shape segments overlapping with the range indicated by start and |
712 // end. Not only those strictly within. | 712 // end. Not only those strictly within. |
713 if (start < segment_range.end && end > segment_range.start) | 713 if (start < segment_range.end && end > segment_range.start) |
714 ShapeSegment(&range_data, segment_range, result.Get()); | 714 ShapeSegment(&range_data, segment_range, result.Get()); |
715 } | 715 } |
716 DCHECK(!result->NumCharacters() || (start == result->StartIndexForResult() && | 716 |
717 end == result->EndIndexForResult())); | 717 #if DCHECK_IS_ON() |
| 718 DCHECK_EQ(length, result->NumCharacters()); |
| 719 if (length) { |
| 720 DCHECK_EQ(start, result->StartIndexForResult()); |
| 721 DCHECK_EQ(end, result->EndIndexForResult()); |
| 722 } |
| 723 #endif |
| 724 |
718 return result.Release(); | 725 return result.Release(); |
719 } | 726 } |
720 | 727 |
721 PassRefPtr<ShapeResult> HarfBuzzShaper::Shape(const Font* font, | 728 PassRefPtr<ShapeResult> HarfBuzzShaper::Shape(const Font* font, |
722 TextDirection direction) const { | 729 TextDirection direction) const { |
723 return Shape(font, direction, 0, text_length_); | 730 return Shape(font, direction, 0, text_length_); |
724 } | 731 } |
725 | 732 |
726 } // namespace blink | 733 } // namespace blink |
OLD | NEW |