Bug 934867 - nsStyleFont::CalcDifference should return a hint when mFont.systemFont differs. r=dbaron
authorCameron McCormack <cam@mcc.id.au>
Wed, 06 Nov 2013 12:23:38 +1100
changeset 153691 d99efe50d0717e30fc44e6915b11f6a9fe07d91e
parent 153690 dbf7a53eeff51052851d3e048d4fca4695be8554
child 153692 b2995c617e4ce4df41acfb5b7dfb143c5108c5c3
push id25603
push usercbook@mozilla.com
push dateWed, 06 Nov 2013 12:08:24 +0000
treeherdermozilla-central@bf1211047db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs934867
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 934867 - nsStyleFont::CalcDifference should return a hint when mFont.systemFont differs. r=dbaron
layout/style/nsStyleStruct.cpp
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -225,17 +225,18 @@ nsChangeHint nsStyleFont::CalcFontDiffer
       (aFont1.alternateValues == aFont2.alternateValues) &&
       (aFont1.featureValueLookup == aFont2.featureValueLookup) &&
       (aFont1.variantCaps == aFont2.variantCaps) &&
       (aFont1.variantEastAsian == aFont2.variantEastAsian) &&
       (aFont1.variantLigatures == aFont2.variantLigatures) &&
       (aFont1.variantNumeric == aFont2.variantNumeric) &&
       (aFont1.variantPosition == aFont2.variantPosition) &&
       (aFont1.fontFeatureSettings == aFont2.fontFeatureSettings) &&
-      (aFont1.languageOverride == aFont2.languageOverride)) {
+      (aFont1.languageOverride == aFont2.languageOverride) &&
+      (aFont1.systemFont == aFont2.systemFont)) {
     if ((aFont1.decorations == aFont2.decorations)) {
       return NS_STYLE_HINT_NONE;
     }
     return NS_STYLE_HINT_VISUAL;
   }
   return NS_STYLE_HINT_REFLOW;
 }