Title: [87156] trunk/Source/WebCore
- Revision
- 87156
- Author
- zimmerm...@webkit.org
- Date
- 2011-05-24 08:49:28 -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
Rename SimpleFontData::FontData subclass to AdditionalFontData, to avoid clashes with the WebCore::FontData class, which breaks the win build.
* platform/graphics/SimpleFontData.cpp:
(WebCore::SimpleFontData::SimpleFontData):
* platform/graphics/SimpleFontData.h:
(WebCore::SimpleFontData::fontData):
* svg/SVGFontData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87155 => 87156)
--- trunk/Source/WebCore/ChangeLog 2011-05-24 15:44:51 UTC (rev 87155)
+++ trunk/Source/WebCore/ChangeLog 2011-05-24 15:49:28 UTC (rev 87156)
@@ -1,5 +1,20 @@
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:
+ (WebCore::SimpleFontData::SimpleFontData):
+ * platform/graphics/SimpleFontData.h:
+ (WebCore::SimpleFontData::fontData):
+ * svg/SVGFontData.h:
+
+2011-05-24 Nikolas Zimmermann <nzimmerm...@rim.com>
+
Reviewed by Antti Koivisto.
Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (87155 => 87156)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2011-05-24 15:44:51 UTC (rev 87155)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2011-05-24 15:49:28 UTC (rev 87156)
@@ -56,7 +56,7 @@
platformCharWidthInit();
}
-SimpleFontData::SimpleFontData(PassOwnPtr<SimpleFontData::FontData> fontData, int size, bool syntheticBold, bool syntheticItalic)
+SimpleFontData::SimpleFontData(PassOwnPtr<AdditionalFontData> fontData, int size, bool syntheticBold, bool syntheticItalic)
: m_platformData(FontPlatformData(size, syntheticBold, syntheticItalic))
, m_fontData(fontData)
, m_treatAsFixedPitch(false)
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (87155 => 87156)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-05-24 15:44:51 UTC (rev 87155)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-05-24 15:49:28 UTC (rev 87156)
@@ -70,7 +70,7 @@
class SimpleFontData : public FontData {
public:
- class FontData {
+ class AdditionalFontData {
WTF_MAKE_FAST_ALLOCATED;
public:
virtual ~FontData() { }
@@ -82,7 +82,7 @@
SimpleFontData(const FontPlatformData&, bool isCustomFont = false, bool isLoading = false, bool isTextOrientationFallback = false);
// Used to create SVG Fonts.
- SimpleFontData(PassOwnPtr<SimpleFontData::FontData>, int size, bool syntheticBold, bool syntheticItalic);
+ SimpleFontData(PassOwnPtr<AdditionalFontData>, int size, bool syntheticBold, bool syntheticItalic);
virtual ~SimpleFontData();
@@ -145,7 +145,7 @@
void determinePitch();
Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
- SimpleFontData::FontData* fontData() const { return m_fontData.get(); }
+ AdditionalFontData* fontData() const { return m_fontData.get(); }
bool isSVGFont() const { return m_fontData; }
virtual bool isCustomFont() const { return m_isCustomFont; }
@@ -222,7 +222,7 @@
float m_avgCharWidth;
FontPlatformData m_platformData;
- OwnPtr<SimpleFontData::FontData> m_fontData;
+ OwnPtr<AdditionalFontData> m_fontData;
mutable OwnPtr<GlyphMetricsMap<FloatRect> > m_glyphToBoundsMap;
mutable GlyphMetricsMap<float> m_glyphToWidthMap;
Modified: trunk/Source/WebCore/svg/SVGFontData.h (87155 => 87156)
--- trunk/Source/WebCore/svg/SVGFontData.h 2011-05-24 15:44:51 UTC (rev 87155)
+++ trunk/Source/WebCore/svg/SVGFontData.h 2011-05-24 15:49:28 UTC (rev 87156)
@@ -26,7 +26,7 @@
namespace WebCore {
-class SVGFontData : public SimpleFontData::FontData {
+class SVGFontData : public SimpleFontData::AdditionalFontData {
public:
static PassOwnPtr<SVGFontData> create(SVGFontFaceElement* element)
{
@@ -35,7 +35,6 @@
virtual ~SVGFontData() { }
- virtual bool isSVGFontData() const { return true; }
virtual void initializeFontData(SimpleFontData*, int size);
SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
