Title: [126456] trunk/Source/WebCore
- Revision
- 126456
- Author
- [email protected]
- Date
- 2012-08-23 11:37:59 -0700 (Thu, 23 Aug 2012)
Log Message
[wx] Unreviewed build fix. Add wx to the list of platforms that use CoreText
APIs on Mac.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126455 => 126456)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 18:36:49 UTC (rev 126455)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 18:37:59 UTC (rev 126456)
@@ -1,5 +1,13 @@
2012-08-23 Kevin Ollivier <[email protected]>
+ [wx] Unreviewed build fix. Add wx to the list of platforms that use CoreText
+ APIs on Mac.
+
+ * platform/graphics/SimpleFontData.h:
+ (SimpleFontData):
+
+2012-08-23 Kevin Ollivier <[email protected]>
+
[wx] Unreviewed build fix. Don't rely on implicit casts, explicitly use the
Cursor constructor that takes a platform cursor for creating native cursors.
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (126455 => 126456)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-08-23 18:36:49 UTC (rev 126455)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-08-23 18:37:59 UTC (rev 126456)
@@ -39,7 +39,7 @@
#include <wtf/PassOwnPtr.h>
#include <wtf/text/StringHash.h>
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
#include <wtf/RetainPtr.h>
#endif
@@ -176,7 +176,7 @@
NSFont* getNSFont() const { return m_platformData.nsFont(); }
#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
#endif
@@ -273,7 +273,7 @@
float m_syntheticBoldOffset;
#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
