Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1045)

Unified Diff: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h

Issue 2066253002: Fix Refcount in FontDataCache for objects from FontFallbackIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
index a8e1060ce01970006cc949844dac1f5c7b667cfe..7f1a065bae1e4a2d868c359b1dc13d5d2a6f80ea 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
@@ -40,12 +40,12 @@ public:
// Some system fallback APIs (Windows, Android) require a character, or a
// portion of the string to be passed. On Mac and Linux, we get a list of
// fonts without passing in characters.
- const FontDataForRangeSet next(const Vector<UChar32>& hintList);
+ const PassRefPtr<FontDataForRangeSet> next(const Vector<UChar32>& hintList);
private:
FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>,
FontFallbackPriority);
- bool rangeSetContributesForHint(const Vector<UChar32> hintList, const FontDataForRangeSet&);
+ bool rangeSetContributesForHint(const Vector<UChar32> hintList, const FontDataForRangeSet*);
bool alreadyLoadingRangeForHintChar(UChar32 hintChar);
void willUseRange(const AtomicString& family, const FontDataForRangeSet&);
@@ -68,7 +68,7 @@ private:
FallbackStage m_fallbackStage;
HashSet<UChar32> m_previouslyAskedForHint;
- Vector<FontDataForRangeSet> m_trackedLoadingRangeSets;
+ Vector<RefPtr<FontDataForRangeSet>> m_trackedLoadingRangeSets;
FontFallbackPriority m_fontFallbackPriority;
};

Powered by Google App Engine
This is Rietveld 408576698