Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QUrl::toEncoded() fix for the case of "password, but no username".
  Fix tst_QFileInfo::isHidden_data on Windows
  QStyleSheetStyle: Fixed some text croped when having padding with native border.
  Lots of mostly cosmetic cleanups to GL2 paint engine
  Move the 0.5 offset we add for aliased rendering to updateMatrix()
  revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
  Read QWS_SIZE from layer rather than screen
  Get rid of no_cast_from_ascii warning
  Docs: Amendments to latest changes to QImageReader docs.
  images: Document QImageReader::loopCount behaviour for infinite loops
  gif: Add unit test for QImageReader::size calls
  gif: 10% speedup on microbenchmark on QImageReader
  png: Avoid calling QImage::scanLine(int) from within a loop
  QImageReader: Avoid errorString creation in the normal case
  Fix text rendering on GL2 paint engine

1 files changed, 43 insertions, 47 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index f1ec6e6..c94c4f4 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -105,13 +105,8 @@ public:
     ~QGL2PaintEngineEx();
 
     bool begin(QPaintDevice *device);
-    bool end();
-
     void ensureActive();
-
-    virtual void fill(const QVectorPath &path, const QBrush &brush);
-    virtual void stroke(const QVectorPath &path, const QPen &pen);
-    virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
+    bool end();
 
     virtual void clipEnabledChanged();
     virtual void penChanged();
@@ -122,20 +117,21 @@ public:
     virtual void renderHintsChanged();
     virtual void transformChanged();
 
-
+    virtual void drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
     virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
+    virtual void drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints);
     virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
                            Qt::ImageConversionFlags flags = Qt::AutoColor);
-    virtual void drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
-
     virtual void drawTextItem(const QPointF &p, const QTextItem &textItem);
+    virtual void fill(const QVectorPath &path, const QBrush &brush);
+    virtual void stroke(const QVectorPath &path, const QPen &pen);
+    virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
 
-    virtual void drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints);
 
     Type type() const { return OpenGL2; }
 
-    void setState(QPainterState *s);
-    QPainterState *createState(QPainterState *orig) const;
+    virtual void setState(QPainterState *s);
+    virtual QPainterState *createState(QPainterState *orig) const;
     inline QOpenGL2PaintEngineState *state() {
         return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
     }
@@ -146,8 +142,6 @@ public:
     void beginNativePainting();
     void endNativePainting();
 
-    const QGLContext* context();
-
     QPixmapFilter *pixmapFilter(int type, const QPixmapFilter *prototype);
 
     void setRenderTextActive(bool);
@@ -169,10 +163,12 @@ public:
 
     QGL2PaintEngineExPrivate(QGL2PaintEngineEx *q_ptr) :
             q(q_ptr),
+            shaderManager(0),
             width(0), height(0),
             ctx(0),
+            useSystemClip(true),
+            addOffset(false),
             inverseScale(1),
-            shaderManager(0),
             inRenderText(false)
     { }
 
@@ -184,45 +180,62 @@ public:
     void updateCompositionMode();
     void updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id = -1);
 
-    void setBrush(const QBrush& brush);
-
-    void transferMode(EngineMode newMode);
     void resetGLState();
 
-    // fill, drawOutline, drawTexture & drawCachedGlyphs are the rendering entry points:
+    // fill, stroke, drawTexture, drawPixmaps & drawCachedGlyphs are the main rendering entry-points,
+    // however writeClip can also be thought of as en entry point as it does similar things.
     void fill(const QVectorPath &path);
+    void stroke(const QVectorPath &path, const QPen &pen);
     void drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque, bool pattern = false);
+    void drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints);
     void drawCachedGlyphs(const QPointF &p, QFontEngineGlyphCache::Type glyphType, const QTextItemInt &ti);
 
+    // draws whatever is in the vertex array:
     void drawVertexArrays(const float *data, int *stops, int stopCount, GLenum primitive);
     void drawVertexArrays(QGL2PEXVertexArray &vertexArray, GLenum primitive) {
         drawVertexArrays((const float *) vertexArray.data(), vertexArray.stops(), vertexArray.stopCount(), primitive);
     }
 
-        // ^ draws whatever is in the vertex array
+    // Composites the bounding rect onto dest buffer:
     void composite(const QGLRect& boundingRect);
-        // ^ Composites the bounding rect onto dest buffer
 
+    // Calls drawVertexArrays to render into stencil buffer:
     void fillStencilWithVertexArray(const float *data, int count, int *stops, int stopCount, const QGLRect &bounds, StencilFillMode mode);
     void fillStencilWithVertexArray(QGL2PEXVertexArray& vertexArray, bool useWindingFill) {
         fillStencilWithVertexArray((const float *) vertexArray.data(), 0, vertexArray.stops(), vertexArray.stopCount(),
                                    vertexArray.boundingRect(),
                                    useWindingFill ? WindingFillMode : OddEvenFillMode);
     }
-        // ^ Calls drawVertexArrays to render into stencil buffer
-
-    bool prepareForDraw(bool srcPixelsAreOpaque);
-        // ^ returns whether the current program changed or not
 
+    void setBrush(const QBrush& brush);
+    void transferMode(EngineMode newMode);
+    bool prepareForDraw(bool srcPixelsAreOpaque); // returns true if the program has changed
     inline void useSimpleShader();
+    inline GLuint location(const QGLEngineShaderManager::Uniform uniform) {
+        return shaderManager->getUniformLocation(uniform);
+    }
+
 
     void prepareDepthRangeForRenderText();
     void restoreDepthRangeForRenderText();
 
+    void clearClip(uint value);
+    void writeClip(const QVectorPath &path, uint value);
+    void resetClipIfNeeded();
+
+    void updateClipScissorTest();
+    void setScissor(const QRect &rect);
+    void regenerateClip();
+    void systemStateChanged();
+
+
     static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
     static QGL2PaintEngineExPrivate *getData(QGL2PaintEngineEx *engine) { return engine->d_func(); }
+    static void cleanupVectorPath(QPaintEngineEx *engine, void *data);
+
 
     QGL2PaintEngineEx* q;
+    QGLEngineShaderManager* shaderManager;
     QGLPaintDevice* device;
     int width, height;
     QGLContext *ctx;
@@ -239,41 +252,25 @@ public:
     bool opacityUniformDirty;
 
     bool stencilClean; // Has the stencil not been used for clipping so far?
+    bool useSystemClip;
     QRegion dirtyStencilRegion;
     QRect currentScissorBounds;
     uint maxClip;
 
     QBrush currentBrush; // May not be the state's brush!
-
-    GLfloat     inverseScale;
+    const QBrush noBrush;
 
     QGL2PEXVertexArray vertexCoordinateArray;
     QGL2PEXVertexArray textureCoordinateArray;
     QDataBuffer<GLfloat> opacityArray;
-
     GLfloat staticVertexCoordinateArray[8];
     GLfloat staticTextureCoordinateArray[8];
 
+    bool addOffset; // When enabled, adds a 0.49,0.49 offset to matrix in updateMatrix
     GLfloat pmvMatrix[3][3];
+    GLfloat inverseScale;
 
-    QGLEngineShaderManager* shaderManager;
-
-    void clearClip(uint value);
-    void writeClip(const QVectorPath &path, uint value);
-    void resetClipIfNeeded();
-
-    void updateClipScissorTest();
-    void setScissor(const QRect &rect);
-    void regenerateClip();
-    void systemStateChanged();
-    uint use_system_clip : 1;
-
-    uint location(QGLEngineShaderManager::Uniform uniform)
-    {
-        return shaderManager->getUniformLocation(uniform);
-    }
-
-    GLuint lastTexture;
+    GLuint lastTextureUsed;
 
     bool needsSync;
     bool inRenderText;
@@ -285,7 +282,6 @@ public:
 
     QTriangulatingStroker stroker;
     QDashedStrokeProcessor dasher;
-    QTransform temporaryTransform;
 
     QScopedPointer<QPixmapFilter> convolutionFilter;
     QScopedPointer<QPixmapFilter> colorizeFilter;