1 files changed, 43 insertions, 6 deletions

diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 17f0d89..922e290 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -81,11 +81,24 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache
 public:
     QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix)
         : QFontEngineGlyphCache(matrix, type), m_current_fontengine(0),
-                                               m_w(0), m_h(0), m_cx(0), m_cy(0), m_currentRowHeight(0)
+                                               m_w(0), m_h(0), m_cx(0), m_cy(0), m_currentRowHeight(0), m_subPixelPositionCount(0)
         { }
 
     virtual ~QTextureGlyphCache() { }
 
+    struct GlyphAndSubPixelPosition
+    {
+        GlyphAndSubPixelPosition(glyph_t g, QFixed spp) : glyph(g), subPixelPosition(spp) {}
+
+        bool operator==(const GlyphAndSubPixelPosition &other) const
+        {
+            return glyph == other.glyph && subPixelPosition == other.subPixelPosition;
+        }
+
+        glyph_t glyph;
+        QFixed subPixelPosition;
+    };
+
     struct Coord {
         int x;
         int y;
@@ -94,17 +107,23 @@ public:
 
         int baseLineX;
         int baseLineY;
+
+        bool isNull() const
+        {
+            return w == 0 || h == 0;
+        }
     };
 
     bool populate(QFontEngine *fontEngine, int numGlyphs, const glyph_t *glyphs,
                   const QFixedPoint *positions);
+    void fillInPendingGlyphs();
 
     virtual void createTextureData(int width, int height) = 0;
     virtual void resizeTextureData(int width, int height) = 0;
     virtual int glyphMargin() const { return 0; }
     virtual int glyphPadding() const { return 0; }
 
-    virtual void fillTexture(const Coord &coord, glyph_t glyph) = 0;
+    virtual void fillTexture(const Coord &coord, glyph_t glyph, QFixed subPixelPosition) = 0;
 
     inline void createCache(int width, int height) {
         m_w = width;
@@ -112,24 +131,42 @@ public:
         createTextureData(width, height);
     }
 
-    inline bool isNull() const { return m_w <= 0 || m_h <= 0; }
+    inline void resizeCache(int width, int height)
+    {
+        resizeTextureData(width, height);
+        m_w = width;
+        m_h = height;
+    }
 
-    QHash<glyph_t, Coord> coords;
+    inline bool isNull() const { return m_h == 0; }
 
-    QImage textureMapForGlyph(glyph_t g) const;
+    QHash<GlyphAndSubPixelPosition, Coord> coords;
     virtual int maxTextureWidth() const { return QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH; }
     virtual int maxTextureHeight() const { return -1; }
 
+    QImage textureMapForGlyph(glyph_t g, QFixed subPixelPosition) const;
+
+    QFixed subPixelPositionForX(QFixed x) const;
+
 protected:
+    int calculateSubPixelPositionCount(glyph_t) const;
+
     QFontEngine *m_current_fontengine;
+    QHash<GlyphAndSubPixelPosition, Coord> m_pendingGlyphs;
 
     int m_w; // image width
     int m_h; // image height
     int m_cx; // current x
     int m_cy; // current y
     int m_currentRowHeight; // Height of last row
+    int m_subPixelPositionCount; // Number of positions within a single pixel for this cache
 };
 
+inline uint qHash(const QTextureGlyphCache::GlyphAndSubPixelPosition &g)
+{
+    return (g.glyph << 8)  | (g.subPixelPosition * 10).round().toInt();
+}
+
 
 class Q_GUI_EXPORT QImageTextureGlyphCache : public QTextureGlyphCache
 {
@@ -139,7 +176,7 @@ public:
     virtual int glyphMargin() const;
     virtual void createTextureData(int width, int height);
     virtual void resizeTextureData(int width, int height);
-    virtual void fillTexture(const Coord &c, glyph_t glyph);
+    virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition);
 
     inline const QImage &image() const { return m_image; }