Title: [87158] trunk/Source/WebCore
- Revision
- 87158
- Author
- zimmerm...@webkit.org
- Date
- 2011-05-24 09:11:02 -0700 (Tue, 24 May 2011)
Log Message
2011-05-24 Nikolas Zimmermann <nzimmerm...@rim.com>
Not reviewed, build fix.
Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
https://bugs.webkit.org/show_bug.cgi?id=60254
Forgot to rename the destructor.
* platform/graphics/SimpleFontData.h:
(WebCore::SimpleFontData::AdditionalFontData::~AdditionalFontData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87157 => 87158)
--- trunk/Source/WebCore/ChangeLog 2011-05-24 16:06:18 UTC (rev 87157)
+++ trunk/Source/WebCore/ChangeLog 2011-05-24 16:11:02 UTC (rev 87158)
@@ -5,6 +5,18 @@
Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
https://bugs.webkit.org/show_bug.cgi?id=60254
+ Forgot to rename the destructor.
+
+ * platform/graphics/SimpleFontData.h:
+ (WebCore::SimpleFontData::AdditionalFontData::~AdditionalFontData):
+
+2011-05-24 Nikolas Zimmermann <nzimmerm...@rim.com>
+
+ Not reviewed, build fix.
+
+ Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
+ https://bugs.webkit.org/show_bug.cgi?id=60254
+
Rename SimpleFontData::FontData subclass to AdditionalFontData, to avoid clashes with the WebCore::FontData class, which breaks the win build.
* platform/graphics/SimpleFontData.cpp:
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (87157 => 87158)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-05-24 16:06:18 UTC (rev 87157)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-05-24 16:11:02 UTC (rev 87158)
@@ -73,7 +73,7 @@
class AdditionalFontData {
WTF_MAKE_FAST_ALLOCATED;
public:
- virtual ~FontData() { }
+ virtual ~AdditionalFontData() { }
virtual void initializeFontData(SimpleFontData*, int) = 0;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
