Remove redundant typesetting checks from Font::width()

Minor cleanup: Font::codePath() already selects ComplexPath whenever
typesettingFeatures are present (our SimplePath doesn't support kerning
and ligatures), so there's no need to duplicate that test in width().

R=schenney@chromium.org,jbroman@chromium.org,eae@chromium.org

Review URL: https://codereview.chromium.org/401123005

git-svn-id: svn://svn.chromium.org/blink/trunk@178557 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/fonts/Font.cpp

@@ -160,9 +160,8 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo
             glyphOverflow = 0;
     }
 
-    bool hasKerningOrLigatures = fontDescription().typesettingFeatures() & (Kerning | Ligatures);
     bool hasWordSpacingOrLetterSpacing = fontDescription().wordSpacing() || fontDescription().letterSpacing();
-    bool isCacheable = (codePathToUse == ComplexPath || hasKerningOrLigatures)
+    bool isCacheable = codePathToUse == ComplexPath
         && !hasWordSpacingOrLetterSpacing // Word spacing and letter spacing can change the width of a word.
         && !run.allowTabs(); // If we allow tabs and a tab occurs inside a word, the width of the word varies based on its position on the line.
 
@@ -180,8 +179,8 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo
     if (codePathToUse == ComplexPath) {
         result = floatWidthForComplexText(run, fallbackFonts, &glyphBounds);
     } else {
-        result = floatWidthForSimpleText(run, fallbackFonts,
-            glyphOverflow || isCacheable ? &glyphBounds : 0);
+        ASSERT(!isCacheable);
+        result = floatWidthForSimpleText(run, fallbackFonts, glyphOverflow ? &glyphBounds : 0);
     }
 
     if (cacheEntry && (!fallbackFonts || fallbackFonts->isEmpty())) {