third_party/WebKit/Source/core/css/FontFace.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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/core/css/FontFace.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix known issues Created 4 years, 10 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

« third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp ('K') | « third_party/WebKit/Source/core/css/CSSStyleSheetResourceTest.cpp ('k') | third_party/WebKit/Source/core/css/FontLoader.h » ('j') | third_party/WebKit/Source/core/dom/PendingScript.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/FontFace.cpp

diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp

index 2f4661d9dc67192a1e0ebcf29cf0d26a4db07a13..710f52745787aa3c1636f7d6e4b94fd0baaff1f6 100644

--- a/third_party/WebKit/Source/core/css/FontFace.cpp

+++ b/third_party/WebKit/Source/core/css/FontFace.cpp

@@ -588,10 +588,10 @@ void FontFace::initCSSFontFace(Document* document, PassRefPtrWillBeRawPtr<CSSVal

const Settings* settings = document ? document->settings() : nullptr;

bool allowDownloading = settings && settings->downloadableBinaryFontsEnabled();

if (allowDownloading && item->isSupportedFormat() && document) {

- FontResource* fetched = item->fetch(document);

+ RefPtrWillBeRawPtr<FontResource> fetched = item->fetch(document);

if (fetched) {

FontLoader* fontLoader = document->styleEngine().fontSelector()->fontLoader();

- source = adoptPtrWillBeNoop(new RemoteFontFaceSource(fetched, fontLoader, CSSValueToFontDisplay(m_display.get())));

+ source = adoptPtrWillBeNoop(new RemoteFontFaceSource(fetched.release(), fontLoader, CSSValueToFontDisplay(m_display.get())));

}

} else {