Fix font family based fallback font selection

Source/platform/fonts/FontFaceCreationParams.h

Index: Source/platform/fonts/FontFaceCreationParams.h
diff --git a/Source/platform/fonts/FontFaceCreationParams.h b/Source/platform/fonts/FontFaceCreationParams.h
new file mode 100644
index 0000000000000000000000000000000000000000..22488c005b11b48f3f7b67255d4604c93add326d
--- /dev/null
+++ b/Source/platform/fonts/FontFaceCreationParams.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2009, Google 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FontFaceCreationParams_h
+#define FontFaceCreationParams_h
+
+#include "wtf/Assertions.h"
+#include "wtf/HashFunctions.h"
+#include "wtf/text/AtomicString.h"
+#include "wtf/text/StringHash.h"
+
+namespace WebCore {
+
+enum FontFaceCreationType {
+    CreateFontByFamily,
+    CreateFontByFciIdAndTtcIndex
+};
+
+class FontFaceCreationParams {
+    FontFaceCreationType m_creationType;
+    AtomicString m_family;
+    int m_fontconfigInterfaceId;
+    int m_ttcIndex;
+
+public:
+    FontFaceCreationParams()
+        : m_creationType(CreateFontByFamily), m_family(AtomicString()), m_fontconfigInterfaceId(0), m_ttcIndex(0)
+    {
+    }
+
+    explicit FontFaceCreationParams(AtomicString family)
+        : m_creationType(CreateFontByFamily), m_family(family), m_fontconfigInterfaceId(0), m_ttcIndex(0)
+    {
+#if OS(WIN) && ENABLE(OPENTYPE_VERTICAL)
+    // Leading "@" in the font name enables Windows vertical flow flag for the font.
+    // Because we do vertical flow by ourselves, we don't want to use the Windows feature.
+    // IE disregards "@" regardless of the orientation, so we follow the behavior and
+    // normalize the family name.
+    m_family = (m_family.isEmpty() || m_family[0] != '@') ? m_family : AtomicString(m_family.impl()->substring(1));
+#endif
+    }
+
+    FontFaceCreationParams(int fontconfigInterfaceId, int ttcIndex = 0)
+        : m_creationType(CreateFontByFciIdAndTtcIndex), m_fontconfigInterfaceId(fontconfigInterfaceId), m_ttcIndex(ttcIndex)
+    {
+    }
+
+    FontFaceCreationType creationType() const { return m_creationType; }
+    AtomicString family() const
+    {
+        ASSERT(m_creationType == CreateFontByFamily);
+        return m_family;
+    }
+    int fontconfigInterfaceId() const
+    {
+        ASSERT(m_creationType == CreateFontByFciIdAndTtcIndex);
+        return m_fontconfigInterfaceId;
+    }
+    int ttcIndex() const
+    {
+        ASSERT(m_creationType == CreateFontByFciIdAndTtcIndex);
+        return m_ttcIndex;
+    }
+
+    unsigned hash() const
+    {
+        if (m_creationType == CreateFontByFciIdAndTtcIndex) {
+            return WTF::IntHash<int>::hash(m_fontconfigInterfaceId);
+        }
+        return CaseFoldingHash::hash(m_family.isEmpty() ? "" : m_family);
+    }
+
+    bool operator==(const FontFaceCreationParams& other) const
+    {
+        return m_creationType == other.m_creationType
+            && equalIgnoringCase(m_family, other.m_family)
+            && m_fontconfigInterfaceId == other.m_fontconfigInterfaceId
+            && m_ttcIndex == other.m_ttcIndex;
+    }
+
+};
+
+} // namespace WebCore
+
+#endif // FontFaceCreationParams_h