Fix Refcount in FontDataCache for objects from FontFallbackIterator

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 564 matching lines @@
     // TODO: Check whether this treatAsZerowidthspace from the previous script
     // segmentation plays a role here, does the new scriptRuniterator handle that correctly?
     while (runSegmenter.consume(&segmentRange)) {
         RefPtr<FontFallbackIterator> fallbackIterator =
             m_font->createFontFallbackIterator(
             segmentRange.fontFallbackPriority);
 
         appendToHolesQueue(HolesQueueNextFont, 0, 0);
         appendToHolesQueue(HolesQueueRange, segmentRange.start, segmentRange.end - segmentRange.start);
 
-        const SimpleFontData* currentFont = nullptr;
-        RefPtr<UnicodeRangeSet> currentFontRangeSet;
+        RefPtr<FontDataForRangeSet> currentFontDataForRangeSet;
 
         bool fontCycleQueued = false;
         while (m_holesQueue.size()) {
             HolesQueueItem currentQueueItem = m_holesQueue.takeFirst();
 
             if (currentQueueItem.m_action == HolesQueueNextFont) {
                 // For now, we're building a character list with which we probe
                 // for needed fonts depending on the declared unicode-range of a
                 // segmented CSS font. Alternatively, we can build a fake font
                 // for the shaper and check whether any glyphs were found, or
                 // define a new API on the shaper which will give us coverage
                 // information?
                 if (!collectFallbackHintChars(fallbackCharsHint, fallbackIterator->needsHintList())) {
                     // Give up shaping since we cannot retrieve a font fallback
                     // font without a hintlist.
                     m_holesQueue.clear();
                     break;
                 }
 
-                FontDataForRangeSet nextFontDataForRangeSet = fallbackIterator->next(fallbackCharsHint);
-                currentFont = nextFontDataForRangeSet.fontData();
-                currentFontRangeSet = nextFontDataForRangeSet.ranges();
+                currentFontDataForRangeSet = fallbackIterator->next(fallbackCharsHint);
 
-                if (!currentFont) {
+                if (!currentFontDataForRangeSet->fontData()) {
                     ASSERT(!m_holesQueue.size());
                     break;
                 }
                 fontCycleQueued = false;
                 continue;
             }
 
             SmallCapsIterator::SmallCapsBehavior smallCapsBehavior = SmallCapsIterator::SmallCapsSameCase;
             if (needsCapsHandling) {
-                capsSupport = OpenTypeCapsSupport(currentFont->platformData().harfBuzzFace(),
+                capsSupport = OpenTypeCapsSupport(
+                    currentFontDataForRangeSet->fontData()->platformData().harfBuzzFace(),
                     fontDescription.variantCaps(),
                     ICUScriptToHBScript(segmentRange.script));
                 if (capsSupport.needsRunCaseSplitting())
                     splitUntilNextCaseChange(currentQueueItem, smallCapsBehavior);
             }
 
             ASSERT(currentQueueItem.m_numCharacters);
 
             const SimpleFontData* smallcapsAdjustedFont = needsCapsHandling
                 && capsSupport.needsSyntheticFont(smallCapsBehavior)
-                ? currentFont->smallCapsFontData(fontDescription).get()
-                : currentFont;
+                ? currentFontDataForRangeSet->fontData()->smallCapsFontData(fontDescription).get()
+                : currentFontDataForRangeSet->fontData();
 
             // Compatibility with SimpleFontData approach of keeping a flag for overriding drawing direction.
             // TODO: crbug.com/506224 This should go away in favor of storing that information elsewhere, for example in
             // ShapeResult.
             const SimpleFontData* directionAndSmallCapsAdjustedFont = fontDataAdjustedForOrientation(smallcapsAdjustedFont,
                 m_font->getFontDescription().orientation(),
                 segmentRange.renderOrientation);
 
             CaseMapIntend caseMapIntend = CaseMapIntend::KeepSameCase;
             if (needsCapsHandling) {
                 caseMapIntend = capsSupport.needsCaseChange(smallCapsBehavior);
             }
 
             CaseMappingHarfBuzzBufferFiller(
                 caseMapIntend,
                 harfBuzzBuffer.get(),
                 m_normalizedBuffer.get(),
                 m_normalizedBufferLength,
                 currentQueueItem.m_startIndex,
                 currentQueueItem.m_numCharacters);
 
             CapsFeatureSettingsScopedOverlay capsOverlay(m_features, capsSupport.fontFeatureToUse(smallCapsBehavior));
 
             if (!shapeRange(harfBuzzBuffer.get(),
                 currentQueueItem.m_startIndex,
                 currentQueueItem.m_numCharacters,
                 directionAndSmallCapsAdjustedFont,
-                currentFontRangeSet,
+                currentFontDataForRangeSet->ranges(),
                 segmentRange.script,
                 language))
                 DLOG(ERROR) << "Shaping range failed.";
 
             if (!extractShapeResults(harfBuzzBuffer.get(),
                 result.get(),
                 fontCycleQueued,
                 currentQueueItem,
                 directionAndSmallCapsAdjustedFont,
                 segmentRange.script,
@@ skipping 28 matching lines @@
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
     result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright();
     result->m_runs.append(std::move(run));
     return result.release();
 }
 
 
 } // namespace blink