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

Unified Diff: third_party/WebKit/Source/core/css/CSSFontSelector.cpp

Issue 2370283002: Revert of Rendering text to a canvas in a frame-less document. (Closed)
Patch Set: Manual patch revert. Created 4 years, 3 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/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 226751504939dff194d968a8fc4032c740fd1b6e..8c20e0245e81b65f35825114e7c70a613366a2cf 100644
--- a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -44,13 +44,14 @@ namespace blink {
CSSFontSelector::CSSFontSelector(Document* document)
: m_document(document)
- , m_genericFontFamilySettings(document->settings()->genericFontFamilySettings())
+ , 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.
ASSERT(m_document);
+ DCHECK(m_document->frame());
FontCache::fontCache()->addClient(this);
FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
}

Powered by Google App Engine
This is Rietveld 408576698