| Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
| index 3df61eb2936d9717bbce6e7dbf2c43a68dbaebc1..5b2fe90d8ef26fb97a79f1b7d17975b71d320032 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
| @@ -637,9 +637,9 @@ void HarfBuzzShaper::shapeSegment(RangeData* rangeData,
|
| // representing the shaping window.
|
| unsigned shapeStart =
|
| std::max(rangeData->start, currentQueueItem.m_startIndex);
|
| - unsigned shapeEnd =
|
| - std::min(rangeData->end, currentQueueItem.m_startIndex +
|
| - currentQueueItem.m_numCharacters);
|
| + unsigned shapeEnd = std::min(
|
| + rangeData->end,
|
| + currentQueueItem.m_startIndex + currentQueueItem.m_numCharacters);
|
|
|
| CaseMappingHarfBuzzBufferFiller(
|
| caseMapIntend, fontDescription.localeOrDefault(), rangeData->buffer,
|
| @@ -651,13 +651,13 @@ void HarfBuzzShaper::shapeSegment(RangeData* rangeData,
|
| hb_direction_t direction =
|
| rangeData->harfBuzzDirection(directionAndSmallCapsAdjustedFont);
|
|
|
| - if (!shapeRange(rangeData->buffer, rangeData->fontFeatures.isEmpty()
|
| - ? 0
|
| - : rangeData->fontFeatures.data(),
|
| - rangeData->fontFeatures.size(),
|
| - directionAndSmallCapsAdjustedFont,
|
| - currentFontDataForRangeSet->ranges(), segment.script,
|
| - direction, language))
|
| + if (!shapeRange(
|
| + rangeData->buffer,
|
| + rangeData->fontFeatures.isEmpty() ? 0
|
| + : rangeData->fontFeatures.data(),
|
| + rangeData->fontFeatures.size(), directionAndSmallCapsAdjustedFont,
|
| + currentFontDataForRangeSet->ranges(), segment.script, direction,
|
| + language))
|
| DLOG(ERROR) << "Shaping range failed.";
|
|
|
| if (!extractShapeResults(rangeData, fontCycleQueued, currentQueueItem,
|
|
|