third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp - Issue 2066253002: Fix Refcount in FontDataCache for objects from FontFallbackIterator

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

Issue 2066253002: Fix Refcount in FontDataCache for objects from FontFallbackIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/FontFallbackIterator.cpp ('k') | third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

index 71d18519bf0aaf8ac392055961946fcd542fb61d..2840a61a4330ecf81b1610978817d38652cd573d 100644

--- a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

@@ -134,7 +134,7 @@ const SimpleFontData* FontFallbackList::determinePrimarySimpleFontData(const Fon

if (fontData->isSegmented()) {

const SegmentedFontData* segmented = toSegmentedFontData(fontData);

for (unsigned i = 0; i < segmented->numFaces(); i++) {

- const SimpleFontData* rangeFontData = segmented->faceAt(i).fontData();

+ const SimpleFontData* rangeFontData = segmented->faceAt(i)->fontData();

eae 2016/06/21 09:19:13 Do we need an ASSERT here? ASSERT(segmented->faceA

if (!rangeFontData->isLoadingFallback())

return rangeFontData;

}

@@ -195,8 +195,11 @@ FallbackListCompositeKey FontFallbackList::compositeKey(const FontDescription& f

if (FontPlatformData* platformData = FontCache::fontCache()->getFontPlatformData(fontDescription, params))

result = FontCache::fontCache()->fontDataFromFontPlatformData(platformData);

}

- if (result)

+ if (result) {

key.add(fontDescription.cacheKey(params));

+ if (!result->isSegmented() && !result->isCustomFont())

+ FontCache::fontCache()->releaseFontData(toSimpleFontData(result));

+ }

}

currentFamily = currentFamily->next();

}