[Win] [EFL] Build fix after r201978.
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jun 2016 22:55:40 +0000 (22:55 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jun 2016 22:55:40 +0000 (22:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158649
<rdar://problem/13258122>

Unreviewed

* platform/graphics/freetype/FontCacheFreeType.cpp:
(WebCore::FontCache::platformAlternateFamilyName):
* platform/graphics/win/FontCacheWin.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@201979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp
Source/WebCore/platform/graphics/win/FontCacheWin.cpp

index 7d6e225..7bcc8ef 100644 (file)
@@ -1,5 +1,17 @@
 2016-06-11  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        [Win] [EFL] Build fix after r201978.
+        https://bugs.webkit.org/show_bug.cgi?id=158649
+        <rdar://problem/13258122>
+
+        Unreviewed
+
+        * platform/graphics/freetype/FontCacheFreeType.cpp:
+        (WebCore::FontCache::platformAlternateFamilyName):
+        * platform/graphics/win/FontCacheWin.cpp:
+
+2016-06-11  Myles C. Maxfield  <mmaxfield@apple.com>
+
         [Cocoa] Map commonly used Chinese Windows font names to names present on Cocoa operating systems
         https://bugs.webkit.org/show_bug.cgi?id=158649
         <rdar://problem/13258122>
index 4948241..7cc699c 100644 (file)
@@ -383,7 +383,7 @@ std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDe
     return platformData;
 }
 
-const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& familyName)
+const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString&)
 {
     return nullAtom;
 }
index 06ba71a..a47bbf2 100644 (file)
@@ -34,6 +34,7 @@
 #include <mlang.h>
 #include <windows.h>
 #include <wtf/HashSet.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>