Title: [112770] trunk/Source/WebCore
- Revision
- 112770
- Author
- m...@apple.com
- Date
- 2012-03-30 20:44:24 -0700 (Fri, 30 Mar 2012)
Log Message
Tried to fix the Chromium Mac build after r112767.
* platform/graphics/SimpleFontData.h:
(SimpleFontData):
(DerivedFontData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112769 => 112770)
--- trunk/Source/WebCore/ChangeLog 2012-03-31 03:36:38 UTC (rev 112769)
+++ trunk/Source/WebCore/ChangeLog 2012-03-31 03:44:24 UTC (rev 112770)
@@ -1,3 +1,11 @@
+2012-03-30 Dan Bernstein <m...@apple.com>
+
+ Tried to fix the Chromium Mac build after r112767.
+
+ * platform/graphics/SimpleFontData.h:
+ (SimpleFontData):
+ (DerivedFontData):
+
2012-03-30 Dirk Schulze <k...@webkit.org>
Colors seem to be parsed using HTML quirks in SVG attributes
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (112769 => 112770)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-03-31 03:36:38 UTC (rev 112769)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-03-31 03:44:24 UTC (rev 112770)
@@ -164,11 +164,8 @@
virtual String description() const;
#endif
-#if PLATFORM(MAC)
- const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
-#endif
-
#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+ const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
NSFont* getNSFont() const { return m_platformData.font(); }
#elif (PLATFORM(WX) && OS(DARWIN))
NSFont* getNSFont() const { return m_platformData.nsFont(); }
@@ -267,7 +264,7 @@
OwnPtr<SimpleFontData> brokenIdeograph;
OwnPtr<SimpleFontData> verticalRightOrientation;
OwnPtr<SimpleFontData> uprightOrientation;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
