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 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
715 } | 715 } |
716 | 716 |
717 #if DCHECK_IS_ON() | 717 #if DCHECK_IS_ON() |
718 DCHECK_EQ(length, result->NumCharacters()); | 718 DCHECK_EQ(length, result->NumCharacters()); |
719 if (length) { | 719 if (length) { |
720 DCHECK_EQ(start, result->StartIndexForResult()); | 720 DCHECK_EQ(start, result->StartIndexForResult()); |
721 DCHECK_EQ(end, result->EndIndexForResult()); | 721 DCHECK_EQ(end, result->EndIndexForResult()); |
722 } | 722 } |
723 #endif | 723 #endif |
724 | 724 |
725 return result.Release(); | 725 return result; |
726 } | 726 } |
727 | 727 |
728 PassRefPtr<ShapeResult> HarfBuzzShaper::Shape(const Font* font, | 728 PassRefPtr<ShapeResult> HarfBuzzShaper::Shape(const Font* font, |
729 TextDirection direction) const { | 729 TextDirection direction) const { |
730 return Shape(font, direction, 0, text_length_); | 730 return Shape(font, direction, 0, text_length_); |
731 } | 731 } |
732 | 732 |
733 } // namespace blink | 733 } // namespace blink |
OLD | NEW |