| Index: Source/WebCore/platform/graphics/GlyphBuffer.h
|
| diff --git a/Source/WebCore/platform/graphics/GlyphBuffer.h b/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| index 21724df636dd88fd4c781021b94f1915e7acb852..a1de93529334a08e6f0e1dac4b5845111085c832 100644
|
| --- a/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| +++ b/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| @@ -49,8 +49,6 @@ class SimpleFontData;
|
|
|
| #if OS(WINCE)
|
| typedef wchar_t GlyphBufferGlyph;
|
| -#elif PLATFORM(QT)
|
| -typedef quint32 GlyphBufferGlyph;
|
| #else
|
| typedef Glyph GlyphBufferGlyph;
|
| #endif
|
| @@ -84,18 +82,6 @@ public:
|
| private:
|
| float advance;
|
| };
|
| -#elif PLATFORM(QT)
|
| -struct GlyphBufferAdvance : public QPointF {
|
| -public:
|
| - GlyphBufferAdvance(const QPointF& advance)
|
| - : QPointF(advance)
|
| - {
|
| - }
|
| -
|
| - void setWidth(qreal width) { QPointF::setX(width); }
|
| - qreal width() const { return QPointF::x(); }
|
| - qreal height() const { return QPointF::y(); }
|
| -};
|
| #else
|
| typedef FloatSize GlyphBufferAdvance;
|
| #endif
|
| @@ -152,8 +138,6 @@ public:
|
| m_advances.append(advance);
|
| #elif OS(WINCE)
|
| m_advances.append(width);
|
| -#elif PLATFORM(QT)
|
| - m_advances.append(QPointF(width, 0));
|
| #else
|
| m_advances.append(FloatSize(width, 0));
|
| #endif
|
|
|