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

Unified Diff: Source/WebCore/platform/graphics/Font.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
« no previous file with comments | « Source/WebCore/css/CSSFontSelector.cpp ('k') | Source/WebCore/platform/graphics/FontFallbackList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/Font.cpp
===================================================================
--- Source/WebCore/platform/graphics/Font.cpp (revision 109698)
+++ Source/WebCore/platform/graphics/Font.cpp (working copy)
@@ -120,11 +120,12 @@
FontSelector* first = m_fontList ? m_fontList->fontSelector() : 0;
FontSelector* second = other.m_fontList ? other.m_fontList->fontSelector() : 0;
-
+
return first == second
&& m_fontDescription == other.m_fontDescription
&& m_letterSpacing == other.m_letterSpacing
&& m_wordSpacing == other.m_wordSpacing
+ && (m_fontList ? m_fontList->fontSelectorVersion() : 0) == (other.m_fontList ? other.m_fontList->fontSelectorVersion() : 0)
&& (m_fontList ? m_fontList->generation() : 0) == (other.m_fontList ? other.m_fontList->generation() : 0);
}
« no previous file with comments | « Source/WebCore/css/CSSFontSelector.cpp ('k') | Source/WebCore/platform/graphics/FontFallbackList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698