Fixing handling of Ligature when letter-spacing is present

Source/platform/fonts/FontDescription.cpp

Index: Source/platform/fonts/FontDescription.cpp
diff --git a/Source/platform/fonts/FontDescription.cpp b/Source/platform/fonts/FontDescription.cpp
index a50c9019eb926db3eb48505c780233ed54144ccf..a59f8015d2c50ed8ddbb2766df0210484d67fffb 100644
--- a/Source/platform/fonts/FontDescription.cpp
+++ b/Source/platform/fonts/FontDescription.cpp
@@ -182,21 +182,26 @@ void FontDescription::updateTypesettingFeatures() const
         break;
     }
 
-    switch (commonLigaturesState()) {
-    case FontDescription::DisabledLigaturesState:
-        m_typesettingFeatures &= ~Ligatures;
-        break;
-    case FontDescription::EnabledLigaturesState:
-        m_typesettingFeatures |= Ligatures;
-        break;
-    case FontDescription::NormalLigaturesState:
-        break;
-    }
-
-    if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
-        || historicalLigaturesState() == FontDescription::EnabledLigaturesState
-        || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
-        m_typesettingFeatures |= WebCore::Ligatures;
+    // As per CSS (http://www.w3.org/TR/CSS2/text.html#propdef-letter-spacing),

[Inactive, 2014/06/09 13:09:44]

Please always point to the latest version of the specs:
http://dev.w3.org/csswg/css-text-3/#letter-spacing-property

Specs are often updated and we wouldn't want to make an update to match an old
version of a spec if we already match the latest version.

FYI, the latest spec says: "When the effective letter-spacing between two
characters is not zero (due to either justification or non-zero computed
letter-spacing), user agents should not apply optional ligatures."

[h.joshi, 2014/06/09 13:33:53]

In "https://developer.mozilla.org/en-US/docs/Web/CSS/letter-spacing" CSS 2 was
written as Recommended thats why used CSS 2 link.
Made changes and included new one as suggested in new patch.

+    // when the resultant space between two characters
+    // is not the same as the default space, user agents should not use ligatures
+    if (m_letterSpacing != 0) {
+        switch (commonLigaturesState()) {
+        case FontDescription::DisabledLigaturesState:
+            m_typesettingFeatures &= ~Ligatures;
+            break;
+        case FontDescription::EnabledLigaturesState:
+            m_typesettingFeatures |= Ligatures;
+            break;
+        case FontDescription::NormalLigaturesState:
+            break;
+        }
+
+        if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
+            || historicalLigaturesState() == FontDescription::EnabledLigaturesState
+            || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
+            m_typesettingFeatures |= WebCore::Ligatures;
+        }
     }
 }