Title: [201979] trunk/Source/WebCore
- Revision
- 201979
- Author
- [email protected]
- Date
- 2016-06-11 15:55:40 -0700 (Sat, 11 Jun 2016)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201978 => 201979)
--- trunk/Source/WebCore/ChangeLog 2016-06-11 21:48:15 UTC (rev 201978)
+++ trunk/Source/WebCore/ChangeLog 2016-06-11 22:55:40 UTC (rev 201979)
@@ -1,5 +1,17 @@
2016-06-11 Myles C. Maxfield <[email protected]>
+ [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 <[email protected]>
+
[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>
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (201978 => 201979)
--- trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2016-06-11 21:48:15 UTC (rev 201978)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2016-06-11 22:55:40 UTC (rev 201979)
@@ -383,7 +383,7 @@
return platformData;
}
-const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& familyName)
+const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString&)
{
return nullAtom;
}
Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (201978 => 201979)
--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2016-06-11 21:48:15 UTC (rev 201978)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2016-06-11 22:55:40 UTC (rev 201979)
@@ -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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
