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

Unified Diff: Source/WebCore/platform/graphics/FontFallbackList.cpp

Issue 9595009: Merge 108574 - REGRESSION (r104060): Web font is not loaded if specified by link element dynamicall… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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
Index: Source/WebCore/platform/graphics/FontFallbackList.cpp
===================================================================
--- Source/WebCore/platform/graphics/FontFallbackList.cpp (revision 109698)
+++ Source/WebCore/platform/graphics/FontFallbackList.cpp (working copy)
@@ -39,6 +39,7 @@
: m_pageZero(0)
, m_cachedPrimarySimpleFontData(0)
, m_fontSelector(0)
+ , m_fontSelectorVersion(0)
, m_familyIndex(0)
, m_generation(fontCache()->generation())
, m_pitch(UnknownPitch)
@@ -57,6 +58,7 @@
m_pitch = UnknownPitch;
m_loadingCustomFonts = false;
m_fontSelector = fontSelector;
+ m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0;
m_generation = fontCache()->generation();
}
« no previous file with comments | « Source/WebCore/platform/graphics/FontFallbackList.h ('k') | Source/WebCore/platform/graphics/FontSelector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698