Explicitly compare FontVariant to enumerators.

Source/platform/fonts/mac/ComplexTextController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 226 matching lines @@
     // We break up glyph run generation for the string by FontData.
     const UChar* cp;
 
     if (m_run.is8Bit()) {
         String stringFor8BitRun = String::make16BitFrom8BitSource(m_run.characters8(), m_run.length());
         cp = stringFor8BitRun.characters16();
         m_stringsFor8BitRuns.append(stringFor8BitRun);
     } else
         cp = m_run.characters16();
 
-    if (m_font.fontDescription().variant())
+    if (m_font.fontDescription().variant() == FontVariantSmallCaps)
         m_smallCapsBuffer.resize(m_end);
 
     unsigned indexOfFontTransition = 0;
     const UChar* curr = cp;
     const UChar* end = cp + m_end;
 
     const SimpleFontData* fontData;
     bool isMissingGlyph;
     const SimpleFontData* nextFontData;
     bool nextIsMissingGlyph;
 
     unsigned markCount;
     const UChar* sequenceStart = curr;
     UChar32 baseCharacter;
     if (!advanceByCombiningCharacterSequence(curr, end, baseCharacter, markCount))
         return;
 
     UChar uppercaseCharacter = 0;
 
     bool isSmallCaps;
-    bool nextIsSmallCaps = m_font.fontDescription().variant() && !(U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK) && (uppercaseCharacter = u_toupper(baseCharacter)) != baseCharacter;
+    bool nextIsSmallCaps = m_font.fontDescription().variant() == FontVariantSmallCaps && !(U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK) && (uppercaseCharacter = u_toupper(baseCharacter)) != baseCharacter;
 
     if (nextIsSmallCaps) {
         m_smallCapsBuffer[sequenceStart - cp] = uppercaseCharacter;
         for (unsigned i = 0; i < markCount; ++i)
             m_smallCapsBuffer[sequenceStart - cp + i + 1] = sequenceStart[i + 1];
     }
 
     nextIsMissingGlyph = false;
     nextFontData = m_font.fontDataForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
     if (!nextFontData)
@@ skipping 381 matching lines @@
 
             lastCharacterIndex = characterIndex;
         }
         if (!isMonotonic)
             complexTextRun.setIsNonMonotonic();
     }
     m_totalWidth += widthSinceLastCommit;
 }
 
 } // namespace WebCore