| Index: third_party/WebKit/Source/core/css/CSSFontSelector.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
|
| index ac73405dd39bc359b29f3ac70fb028ae653a484a..56f954d1e30c6ff297e79f8b79f1d58285f78c3c 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
|
| @@ -46,10 +46,9 @@ CSSFontSelector::CSSFontSelector(Document* document)
|
| : m_document(document),
|
| m_genericFontFamilySettings(
|
| document->frame()->settings()->genericFontFamilySettings()) {
|
| - // FIXME: An old comment used to say there was no need to hold a reference to m_document
|
| - // because "we are guaranteed to be destroyed before the document". But there does not
|
| - // seem to be any such guarantee.
|
| -
|
| + // FIXME: An old comment used to say there was no need to hold a reference to
|
| + // m_document because "we are guaranteed to be destroyed before the document".
|
| + // But there does not seem to be any such guarantee.
|
| ASSERT(m_document);
|
| DCHECK(m_document->frame());
|
| FontCache::fontCache()->addClient(this);
|
| @@ -127,7 +126,8 @@ PassRefPtr<FontData> CSSFontSelector::getFontData(
|
| m_fontFaceCache.get(fontDescription, familyName))
|
| return face->getFontData(fontDescription);
|
|
|
| - // Try to return the correct font based off our settings, in case we were handed the generic font family name.
|
| + // Try to return the correct font based off our settings, in case we were
|
| + // handed the generic font family name.
|
| AtomicString settingsFamilyName = familyNameFromSettings(
|
| m_genericFontFamilySettings, fontDescription, familyName);
|
| if (settingsFamilyName.isEmpty())
|
|
|