Explicitly compare FontVariant to enumerators.

Source/platform/fonts/WidthIterator.cpp

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 166 matching lines @@
         }
 
         if (fontData != lastFontData && width) {
             if (shouldApplyFontTransforms())
                 m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, m_typesettingFeatures, charactersTreatedAsSpace);
 
             lastFontData = fontData;
             if (m_fallbackFonts && fontData != primaryFont) {
                 // FIXME: This does a little extra work that could be avoided if
                 // glyphDataForCharacter() returned whether it chose to use a small caps font.
-                if (!m_font->fontDescription().variant() || character == toUpper(character))
+                if (m_font->fontDescription().variant() == FontVariantNormal || character == toUpper(character))
                     m_fallbackFonts->add(fontData);
                 else {
+                    ASSERT(m_font->fontDescription().variant() == FontVariantSmallCaps);
                     const GlyphData& uppercaseGlyphData = m_font->glyphDataForCharacter(toUpper(character), rtl);
                     if (uppercaseGlyphData.fontData != primaryFont)
                         m_fallbackFonts->add(uppercaseGlyphData.fontData);
                 }
             }
         }
 
         if (hasExtraSpacing) {
             // Account for letter-spacing.
             if (width && m_font->fontDescription().letterSpacing())
@@ skipping 131 matching lines @@
     unsigned oldSize = glyphBuffer.size();
     advance(m_currentCharacter + 1, &glyphBuffer);
     float w = 0;
     for (unsigned i = oldSize; i < glyphBuffer.size(); ++i)
         w += glyphBuffer.advanceAt(i).width();
     width = w;
     return glyphBuffer.size() > oldSize;
 }
 
 }