From 94cedb692a1f6fbaae2ff0b96a7e50512ac6f215 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Fri, 14 Jan 2011 11:02:54 +0100
Subject: Free memory when disabling the unified toolbar.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/widgets/qmainwindow.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index da902d5..214cf05 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1526,12 +1526,23 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set)
 
 #ifdef QT_MAC_USE_COCOA
     // Activate the unified toolbar with the raster engine.
-    if (windowSurface()) {
+    if (windowSurface() && set) {
         d->layout->unifiedSurface = new QUnifiedToolbarSurface(this);
     }
 #endif // QT_MAC_USE_COCOA
 
     d->layout->updateHIToolBarStatus();
+
+#ifdef QT_MAC_USE_COCOA
+    // Deactivate the unified toolbar with the raster engine.
+    if (windowSurface() && !set) {
+        if (d->layout->unifiedSurface) {
+            delete d->layout->unifiedSurface;
+            d->layout->unifiedSurface = 0;
+        }
+    }
+#endif // QT_MAC_USE_COCOA
+
     // Enabling the unified toolbar clears the opaque size grip setting, update it.
     d->macUpdateOpaqueSizeGrip();
 #else
-- 
cgit v0.12


From 6482a5c5e272d79c312a5f5ef16ee2adf21f4504 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 18 Jan 2011 16:32:17 +0100
Subject: Add a utility function to call setNeedsDisplay:

This allows to trigger a drawRect: on the NSView
associated with a QWidget.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qt_cocoa_helpers_mac.mm  | 7 +++++++
 src/gui/kernel/qt_cocoa_helpers_mac_p.h | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 48d21e9..74d44a3 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1590,6 +1590,13 @@ void qt_mac_display(QWidget *widget)
     return;
 }
 
+void qt_mac_setneedsdisplay(QWidget *widget)
+{
+    NSView *theNSView = qt_mac_nativeview_for(widget);
+    [theNSView setNeedsDisplay:YES];
+    return;
+}
+
 #endif // QT_MAC_USE_COCOA
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index 04c2d06..25dcdc3 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -227,7 +227,10 @@ void qt_cocoaPostMessage(id target, SEL selector, int argCount=0, id arg1=0, id
 
 void qt_mac_post_retranslateAppMenu();
 
+#ifdef QT_MAC_USE_COCOA
 void qt_mac_display(QWidget *widget);
+void qt_mac_setneedsdisplay(QWidget *widget);
+#endif // QT_MAC_USE_COCOA
 
 QT_END_NAMESPACE
 
-- 
cgit v0.12


From b595c2fbe0fa354190b713ef09dd1f348e22e2b6 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Fri, 21 Jan 2011 12:55:23 +0100
Subject: Set the graphics system name in the graphics system factory.

This allows us to know which graphics system is
in use at runtime.

Reviewed-by: Jani Hautakangas
---
 src/gui/painting/qgraphicssystem_runtime.cpp | 1 -
 src/gui/painting/qgraphicssystemfactory.cpp  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index a9fbbee..bd27e9d 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -322,7 +322,6 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
     : m_windowSurfaceDestroyPolicy(DestroyImmediately),
       m_graphicsSystem(0)
 {
-    QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
     QApplicationPrivate::runtime_graphics_system = true;
 
 #ifdef QT_DEFAULT_RUNTIME_SYSTEM
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 3adeba4..1416f7c 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -45,6 +45,7 @@
 #include "qmutex.h"
 
 #include "qapplication.h"
+#include <private/qapplication_p.h>
 #include "qgraphicssystem_raster_p.h"
 #include "qgraphicssystem_runtime_p.h"
 #include "qdebug.h"
@@ -79,6 +80,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
     }
 #endif
 
+    QApplicationPrivate::graphics_system_name = system;
     if (system == QLatin1String("raster"))
         return new QRasterGraphicsSystem;
     else if (system == QLatin1String("runtime"))
-- 
cgit v0.12


From f723903b6990655c12fb1747a816ed62b01e87c0 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 25 Jan 2011 14:50:17 +0100
Subject: Add utility functions for using Core Graphics contexts.

These snippets are often used while managing
Core Graphics contexts. Putting them in inlined
functions makes code easier to read.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qt_cocoa_helpers_mac_p.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index 25dcdc3..b177210 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -232,6 +232,34 @@ void qt_mac_display(QWidget *widget);
 void qt_mac_setneedsdisplay(QWidget *widget);
 #endif // QT_MAC_USE_COCOA
 
+
+// Utility functions to ease the use of Core Graphics contexts.
+
+inline void qt_mac_retain_graphics_context(CGContextRef context)
+{
+    CGContextRetain(context);
+    CGContextSaveGState(context);
+}
+
+inline void qt_mac_release_graphics_context(CGContextRef context)
+{
+    CGContextRestoreGState(context);
+    CGContextRelease(context);
+}
+
+inline void qt_mac_draw_image(CGContextRef context, CGContextRef imageContext, CGRect area, CGRect drawingArea)
+{
+    CGImageRef image = CGBitmapContextCreateImage(imageContext);
+    CGImageRef subImage = CGImageCreateWithImageInRect(image, area);
+
+    CGContextTranslateCTM (context, 0, drawingArea.origin.y + CGRectGetMaxY(drawingArea));
+    CGContextScaleCTM(context, 1, -1);
+    CGContextDrawImage(context, drawingArea, subImage);
+
+    CGImageRelease(subImage);
+    CGImageRelease(image);
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_COCOA_HELPERS_MAC_P_H
-- 
cgit v0.12


From 85b8631c2f30947e3c8364c903a4f85abb8f11e2 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 25 Jan 2011 15:07:51 +0100
Subject: Small typo fix.

Reviewed-by: Eskil Abrahamsen Blomfeldt
---
 src/gui/kernel/qcocoaview_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index e02cf11..6059946 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -547,7 +547,7 @@ static int qCocoaViewCount = 0;
         }
 
         // Since we don't want to use the native engine, we must exit, however
-        // widgets that are set to paint on screen, spesifically QGLWidget,
+        // widgets that are set to paint on screen, specifically QGLWidget,
         // requires the following code to execute in order to be drawn.
         if (!qwidget->testAttribute(Qt::WA_PaintOnScreen))
             return;
-- 
cgit v0.12


From 26d25ab46900d84b44e451c2a0a986bfed94a3f4 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 25 Jan 2011 15:23:34 +0100
Subject: Move the flushing to [view drawRect:rect]

Instead of flushing by grabbing the Core Graphics
context, we do it directly in the drawRect:
method.

This approach allows us to call flush() many times
and only proceed to flush when the system is
ready.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoaview_mac.mm                | 114 +++++++++++++++++++-----
 src/gui/kernel/qwidget.cpp                      |   1 +
 src/gui/kernel/qwidget_p.h                      |   5 +-
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp |  71 +++------------
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h |   7 +-
 src/gui/painting/qwindowsurface_raster.cpp      |  42 +++++----
 src/gui/painting/qwindowsurface_raster_p.h      |  11 +++
 7 files changed, 153 insertions(+), 98 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 6059946..e50c401 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -52,6 +52,8 @@
 #include <private/qmultitouch_mac_p.h>
 #include <private/qevent_p.h>
 #include <private/qbackingstore_p.h>
+#include <private/qwindowsurface_raster_p.h>
+#include <private/qunifiedtoolbarsurface_mac_p.h>
 
 #include <qscrollarea.h>
 #include <qhash.h>
@@ -530,8 +532,86 @@ static int qCocoaViewCount = 0;
     if (!qwidget)
         return;
 
+    // Getting context.
+    CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+    qt_mac_retain_graphics_context(context);
+
     // We use a different graphics system.
-    if (QApplicationPrivate::graphicsSystem() != 0 && !qwidgetprivate->isInUnifiedToolbar) {
+    if (QApplicationPrivate::graphicsSystem() != 0) {
+
+        // Raster engine.
+        if (QApplicationPrivate::graphics_system_name == QLatin1String("raster")) {
+
+            if (!qwidgetprivate->isInUnifiedToolbar) {
+
+                // Qt handles the painting occuring inside the window.
+                // Cocoa also keeps track of all widgets as NSView and therefore might
+                // ask for a repainting of a widget even if Qt is already taking care of it.
+                //
+                // The only valid reason for Cocoa to call drawRect: is for window manipulation
+                // (ie. resize, ...).
+                //
+                // Qt will then forward the update to the children.
+                if (!qwidget->isWindow()) {
+                    qt_mac_release_graphics_context(context);
+                    return;
+                }
+
+                QRasterWindowSurface *winSurface = dynamic_cast<QRasterWindowSurface *>(qwidget->windowSurface());
+                if (!winSurface || !winSurface->needsFlush) {
+                    qt_mac_release_graphics_context(context);
+                    return;
+                }
+
+                // Clip to region.
+                const QVector<QRect> &rects = winSurface->regionToFlush.rects();
+                for (int i = 0; i < rects.size(); ++i) {
+                    const QRect &rect = rects.at(i);
+                    CGContextAddRect(context, CGRectMake(rect.x(), rect.y(), rect.width(), rect.height()));
+                }
+                CGContextClip(context);
+
+                QRect r = winSurface->regionToFlush.boundingRect();
+                const CGRect area = CGRectMake(r.x(), r.y(), r.width(), r.height());
+
+                qt_mac_draw_image(context, winSurface->imageContext(), area, area);
+
+                winSurface->needsFlush = false;
+                winSurface->regionToFlush = QRegion();
+
+            } else {
+
+                QUnifiedToolbarSurface *unifiedSurface = dynamic_cast<QUnifiedToolbarSurface *>(qwidgetprivate->unifiedSurface);
+                if (!unifiedSurface || !qwidgetprivate->flushRequested) {
+                    qt_mac_release_graphics_context(context);
+                    return;
+                }
+
+                // We render the content of the toolbar in the surface.
+                unifiedSurface->updateToolbarOffset(qwidget);
+                QRect beginPaintRect(qwidgetprivate->toolbar_offset.x(), qwidgetprivate->toolbar_offset.y(), qwidget->geometry().width(), qwidget->geometry().height());
+                QRegion beginPaintRegion(beginPaintRect);
+
+                unifiedSurface->beginPaint(beginPaintRegion);
+                qwidget->render(unifiedSurface->paintDevice(), qwidgetprivate->toolbar_offset, QRegion(), QWidget::DrawChildren);
+
+                int areaX = qwidgetprivate->toolbar_offset.x();
+                int areaY = qwidgetprivate->toolbar_offset.y();
+                int areaWidth = qwidget->geometry().width();
+                int areaHeight = qwidget->geometry().height();
+                const CGRect area = CGRectMake(areaX, areaY, areaWidth, areaHeight);
+                const CGRect drawingArea = CGRectMake(0, 0, areaWidth, areaHeight);
+
+                qt_mac_draw_image(context, unifiedSurface->imageContext(), area, drawingArea);
+
+                qwidgetprivate->flushRequested = false;
+
+            }
+
+            CGContextFlush(context);
+            qt_mac_release_graphics_context(context);
+            return;
+        }
 
         // Qt handles the painting occuring inside the window.
         // Cocoa also keeps track of all widgets as NSView and therefore might
@@ -553,19 +633,8 @@ static int qCocoaViewCount = 0;
             return;
     }
 
-    CGContextRef cg = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-    CGContextRetain(cg);
-    qwidgetprivate->hd = cg;
-
-    // We steal the CGContext for flushing in the unified toolbar with the raster engine.
-    if (QApplicationPrivate::graphicsSystem() != 0 && qwidgetprivate->isInUnifiedToolbar) {
-        qwidgetprivate->cgContext = cg;
-        qwidgetprivate->hasOwnContext = true;
-        qwidgetprivate->unifiedSurface->flush(qwidget, qwidgetprivate->ut_rg, qwidgetprivate->ut_pt);
-        return;
-    }
-
-    CGContextSaveGState(cg);
+    // Native engine.
+    qwidgetprivate->hd = context;
 
     if (qwidget->isVisible() && qwidget->updatesEnabled()) { //process the actual paint event.
         if (qwidget->testAttribute(Qt::WA_WState_InPaintEvent))
@@ -600,18 +669,18 @@ static int qCocoaViewCount = 0;
             engine->setSystemClip(qrgn);
         if (qwidgetprivate->extra && qwidgetprivate->extra->hasMask) {
             CGRect widgetRect = CGRectMake(0, 0, qwidget->width(), qwidget->height());
-            CGContextTranslateCTM (cg, 0, widgetRect.size.height);
-            CGContextScaleCTM(cg, 1, -1);
+            CGContextTranslateCTM (context, 0, widgetRect.size.height);
+            CGContextScaleCTM(context, 1, -1);
             if (qwidget->isWindow())
-                CGContextClearRect(cg, widgetRect);
-            CGContextClipToMask(cg, widgetRect, qwidgetprivate->extra->imageMask);
-            CGContextScaleCTM(cg, 1, -1);
-            CGContextTranslateCTM (cg, 0, -widgetRect.size.height);
+                CGContextClearRect(context, widgetRect);
+            CGContextClipToMask(context, widgetRect, qwidgetprivate->extra->imageMask);
+            CGContextScaleCTM(context, 1, -1);
+            CGContextTranslateCTM (context, 0, -widgetRect.size.height);
         }
 
         if (qwidget->isWindow() && !qwidgetprivate->isOpaque
                 && !qwidget->testAttribute(Qt::WA_MacBrushedMetal)) {
-            CGContextClearRect(cg, NSRectToCGRect(aRect));
+            CGContextClearRect(context, NSRectToCGRect(aRect));
         }
 
         // Check for alien widgets, use qwidgetPrivate->drawWidget() to draw the widget if this
@@ -653,8 +722,7 @@ static int qCocoaViewCount = 0;
                      " widget outside of the PaintEvent");
     }
     qwidgetprivate->hd = 0;
-    CGContextRestoreGState(cg);
-    CGContextRelease(cg);
+    qt_mac_release_graphics_context(context);
 }
 
 - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 16f64ff..056aea6 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -324,6 +324,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
     hasOwnContext = false;
     isInUnifiedToolbar = false;
     unifiedSurface = 0;
+    askedForFlush = false;
 #endif // QT_MAC_USE_COCOA
 #ifdef QWIDGET_EXTRA_DEBUG
     static int count = 0;
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 6b85391..f5a965c 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -852,13 +852,16 @@ public:
     // Do we need to change the methods?
     bool changeMethods;
     bool hasOwnContext;
+
+    // Unified toolbar variables
     CGContextRef cgContext;
     QRegion ut_rg;
     QPoint ut_pt;
     bool isInUnifiedToolbar;
     QWindowSurface *unifiedSurface;
     QPoint toolbar_offset;
-#endif
+    bool askedForFlush;
+#endif // QT_MAC_USE_COCOA
     void determineWindowClass();
     void transferChildren();
     bool qt_mac_dnd_event(uint, DragRef);
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 02ba8db..38dc632 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -92,6 +92,11 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
     }
 }
 
+void QUnifiedToolbarSurface::updateRedirection(QWidget *widget)
+{
+    recursiveRedirect(widget, widget->d_func()->toolbar_offset);
+}
+
 void QUnifiedToolbarSurface::insertToolbar(QWidget *toolbar, const QPoint &offset)
 {
     setGeometry(QRect(QPoint(0, 0), QSize(offset.x() + toolbar->width(), 100))); // FIXME
@@ -130,67 +135,13 @@ void QUnifiedToolbarSurface::updateToolbarOffset(QWidget *widget)
 void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &offset)
 {
     Q_D(QUnifiedToolbarSurface);
-
-    QRegion flushingRegion(widget->rect());
-
-    if (!d->image || rgn.rectCount() == 0) {
-        return;
-    }
-
     Q_UNUSED(offset);
 
-    // Get a context for the widget.
-    CGContextRef context;
-    if (!(widget->d_func()->hasOwnContext)) {
-        widget->d_func()->ut_rg = rgn;
-        widget->d_func()->ut_pt = offset;
-        qt_mac_display(widget);
+    if (!d->image || rgn.rectCount() == 0)
         return;
-    } else {
-        // We render the content of the toolbar in the surface.
-        updateToolbarOffset(widget);
-        QRect beginPaintRect(widget->d_func()->toolbar_offset.x(), widget->d_func()->toolbar_offset.y(), widget->geometry().width(), widget->geometry().height());
-        QRegion beginPaintRegion(beginPaintRect);
-
-        context = widget->d_func()->cgContext;
-        beginPaint(beginPaintRegion);
-        widget->render(widget->d_func()->unifiedSurface->paintDevice(), widget->d_func()->toolbar_offset, QRegion(), QWidget::DrawChildren);
-    }
-
-    CGContextSaveGState(context);
-
-    int areaX = widget->d_func()->toolbar_offset.x();
-    int areaY = widget->d_func()->toolbar_offset.y();
-    int areaWidth = widget->geometry().width();
-    int areaHeight = widget->geometry().height();
-    const CGRect area = CGRectMake(areaX, areaY, areaWidth, areaHeight);
 
-    // Clip to region.
-    const QVector<QRect> &rects = flushingRegion.rects();
-    for (int i = 0; i < rects.size(); ++i) {
-        const QRect &rect = rects.at(i);
-        CGContextAddRect(context, CGRectMake(rect.x(), rect.y(), rect.width(), rect.height()));
-    }
-    CGContextAddRect(context, area);
-    CGContextClip(context);
-
-
-    CGImageRef image = CGBitmapContextCreateImage(d->image->cg);
-    CGImageRef subImage = CGImageCreateWithImageInRect(image, area);
-
-    const CGRect drawingArea = CGRectMake(0, 0, areaWidth, areaHeight);
-    qt_mac_drawCGImage(context, &drawingArea, subImage);
-
-    CGImageRelease(subImage);
-    CGImageRelease(image);
-
-    CGContextFlush(context);
-
-    // Restore context.
-    CGContextRestoreGState(context);
-    CGContextRelease(context);
-    widget->d_func()->cgContext = 0;
-    widget->d_func()->hasOwnContext = false;
+    widget->d_func()->askedForFlush = true;
+    qt_mac_setneedsdisplay(widget);
 }
 
 void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widget)
@@ -254,6 +205,12 @@ void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widge
     delete oldImage;
 }
 
+CGContextRef QUnifiedToolbarSurface::imageContext()
+{
+    Q_D(QUnifiedToolbarSurface);
+    return d->image->cg;
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index 3bc0404..6e40a17 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -82,10 +82,13 @@ public:
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
+    void updateRedirection(QWidget *widget);
+    void updateToolbarOffset(QWidget *widget);
 
-private:
     QPaintDevice *paintDevice();
-    void updateToolbarOffset(QWidget *widget);
+    CGContextRef imageContext();
+
+private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
     void recursiveRedirect(QObject *widget, const QPoint &offset);
 
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 2b4e125..92e9425 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -98,6 +98,11 @@ QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurfa
     d_ptr->image = 0;
     d_ptr->inSetGeometry = false;
     setStaticContentsSupport(true);
+
+#ifdef QT_MAC_USE_COCOA
+    needsFlush = false;
+    regionToFlush = QRegion();
+#endif // QT_MAC_USE_COCOA
 }
 
 
@@ -251,13 +256,23 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
 #ifdef Q_WS_MAC
 
+    Q_UNUSED(offset);
+
     // This is mainly done for native components like native "open file" dialog.
     if (widget->testAttribute(Qt::WA_DontShowOnScreen)) {
         return;
     }
 
 #ifdef QT_MAC_USE_COCOA
+    this->needsFlush = true;
+    this->regionToFlush += rgn;
+
+    // The actual flushing will be processed in [view drawRect:rect]
+    qt_mac_setneedsdisplay(widget);
+
     // Unified toolbar hack.
+    // We issue a flush call for each QToolBar so they get repainted right after
+    // the main window.
     QMainWindow* mWindow = qobject_cast<QMainWindow*>(widget->window());
     if (mWindow) {
         QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout());
@@ -267,24 +282,17 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
             QToolBar* toolbar = toolbarList.at(i);
             if (mLayout->toolBarArea(toolbar) == Qt::TopToolBarArea) {
                 QWidget* tbWidget = (QWidget*) toolbar;
-                if (tbWidget->d_func()->unifiedSurface) {
+                if (tbWidget->d_func()->unifiedSurface)
                     tbWidget->d_func()->unifiedSurface->flush(tbWidget, rgn, offset);
-                }
             }
         }
     }
-#endif // QT_MAC_USE_COCOA
-
-    Q_UNUSED(offset);
+#else
     // Get a context for the widget.
-#ifndef QT_MAC_USE_COCOA
     CGContextRef context;
     CGrafPtr port = GetWindowPort(qt_mac_window_for(widget));
     QDBeginCGContext(port, &context);
-#else
-    extern CGContextRef qt_mac_graphicsContextFor(QWidget *);
-    CGContextRef context = qt_mac_graphicsContextFor(widget);
-#endif
+
     CGContextRetain(context);
     CGContextSaveGState(context);
 
@@ -310,16 +318,12 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     CGImageRelease(subImage);
     CGImageRelease(image);
 
-#ifndef QT_MAC_USE_COCOA
     QDEndCGContext(port, &context);
-#else
-    CGContextFlush(context);
-#endif
 
     // Restore context.
     CGContextRestoreGState(context);
     CGContextRelease(context);
-
+#endif // QT_MAC_USE_COCOA
 
 #endif // Q_WS_MAC
 
@@ -461,4 +465,12 @@ void QRasterWindowSurface::prepareBuffer(QImage::Format format, QWidget *widget)
     delete oldImage;
 }
 
+#ifdef QT_MAC_USE_COCOA
+CGContextRef QRasterWindowSurface::imageContext()
+{
+    Q_D(QRasterWindowSurface);
+    return d->image->cg;
+}
+#endif // QT_MAC_USE_COCOA
+
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index a7c3b9f..4674fa0 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -56,6 +56,10 @@
 #include <qglobal.h>
 #include "private/qwindowsurface_p.h"
 
+#ifdef QT_MAC_USE_COCOA
+# include <private/qt_cocoa_helpers_mac_p.h>
+#endif // QT_MAC_USE_COCOA
+
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_WS_WIN
@@ -106,6 +110,13 @@ public:
     void setGeometry(const QRect &rect);
     bool scroll(const QRegion &area, int dx, int dy);
 
+#ifdef QT_MAC_USE_COCOA
+    CGContextRef imageContext();
+
+    bool needsFlush;
+    QRegion regionToFlush;
+#endif // QT_MAC_USE_COCOA
+
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
     Q_DECLARE_PRIVATE(QRasterWindowSurface)
-- 
cgit v0.12


From e1a1ff63d3078b01045a526a54d923ac0bae1032 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 26 Jan 2011 12:43:02 +0100
Subject: Change variable name.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qwidget.cpp                      | 2 +-
 src/gui/kernel/qwidget_p.h                      | 2 +-
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 056aea6..88348cd 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -324,7 +324,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
     hasOwnContext = false;
     isInUnifiedToolbar = false;
     unifiedSurface = 0;
-    askedForFlush = false;
+    flushRequested = false;
 #endif // QT_MAC_USE_COCOA
 #ifdef QWIDGET_EXTRA_DEBUG
     static int count = 0;
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index f5a965c..4e91358 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -860,7 +860,7 @@ public:
     bool isInUnifiedToolbar;
     QWindowSurface *unifiedSurface;
     QPoint toolbar_offset;
-    bool askedForFlush;
+    bool flushRequested;
 #endif // QT_MAC_USE_COCOA
     void determineWindowClass();
     void transferChildren();
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 38dc632..4c027f8 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -140,7 +140,7 @@ void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QP
     if (!d->image || rgn.rectCount() == 0)
         return;
 
-    widget->d_func()->askedForFlush = true;
+    widget->d_func()->flushRequested = true;
     qt_mac_setneedsdisplay(widget);
 }
 
-- 
cgit v0.12


From c710993bc1653e85f598ea099de2eb23904f0bcf Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 26 Jan 2011 16:17:13 +0100
Subject: Remove useless displayIfNeeded: definition.

This is no longer needed for the raster engine.
We don't need to sync the backing store this way.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 60cdfb9..0150e75 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -346,22 +346,6 @@ QT_END_NAMESPACE
     return dropResult;
 }
 
-- (void)displayIfNeeded
-{
-
-    QWidget *qwidget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
-    if (qwidget == 0) {
-        [super displayIfNeeded];
-        return;
-    }
-
-    if (QApplicationPrivate::graphicsSystem() != 0) {
-        if (QWidgetBackingStore *bs = qt_widget_private(qwidget)->maybeBackingStore())
-            bs->sync(qwidget, qwidget->rect());
-    }
-    [super displayIfNeeded];
-}
-
 // This is a hack and it should be removed once we find the real cause for
 // the painting problems.
 // We have a static variable that signals if we have been called before or not.
-- 
cgit v0.12


From e10a438a90b369c894b5f39cc1ab61ae68ff200c Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 26 Jan 2011 16:29:28 +0100
Subject: Force the display: in the unified toolbar.

Instead of calling setNeedsDisplay:, we call have
to call display: to avoid flickering.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 4c027f8..5f52679 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -141,7 +141,9 @@ void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QP
         return;
 
     widget->d_func()->flushRequested = true;
-    qt_mac_setneedsdisplay(widget);
+
+    // We call display: directly to avoid flickering in the toolbar.
+    qt_mac_display(widget);
 }
 
 void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widget)
-- 
cgit v0.12


From b0d682080023dc07e912bf273d007306e758dd01 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Thu, 27 Jan 2011 10:24:02 +0100
Subject: Move all display: utility functions.

All utility functions to call display: are now
placed in qt_cocoa_helpers_mac.mm

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qt_cocoa_helpers_mac.mm     | 19 ++++++++++++++++++-
 src/gui/kernel/qt_cocoa_helpers_mac_p.h    |  3 ++-
 src/gui/kernel/qwidget_mac.mm              | 23 ++---------------------
 src/gui/painting/qwindowsurface_raster.cpp |  2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 74d44a3..71f59e3 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1590,13 +1590,30 @@ void qt_mac_display(QWidget *widget)
     return;
 }
 
-void qt_mac_setneedsdisplay(QWidget *widget)
+void qt_mac_setNeedsDisplay(QWidget *widget)
 {
     NSView *theNSView = qt_mac_nativeview_for(widget);
     [theNSView setNeedsDisplay:YES];
     return;
 }
 
+void qt_mac_setNeedsDisplayInRect(QWidget *widget, QRegion region)
+{
+    NSView *theNSView = qt_mac_nativeview_for(widget);
+    if (region.isEmpty()) {
+        [theNSView setNeedsDisplay:YES];
+        return;
+    }
+
+    QVector<QRect> rects = region.rects();
+    for (int i = 0; i < rects.count(); ++i) {
+        const QRect &rect = rects.at(i);
+        NSRect nsrect = NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
+        [theNSView setNeedsDisplayInRect:nsrect];
+    }
+
+}
+
 #endif // QT_MAC_USE_COCOA
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index b177210..a80c2e1 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -229,7 +229,8 @@ void qt_mac_post_retranslateAppMenu();
 
 #ifdef QT_MAC_USE_COCOA
 void qt_mac_display(QWidget *widget);
-void qt_mac_setneedsdisplay(QWidget *widget);
+void qt_mac_setNeedsDisplay(QWidget *widget);
+void qt_mac_setNeedsDisplayInRect(QWidget *widget, QRegion region);
 #endif // QT_MAC_USE_COCOA
 
 
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 3c5c458..83483f5 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -580,25 +580,6 @@ inline static void qt_mac_set_window_group_to_popup(OSWindowRef window)
 }
 #endif
 
-#ifdef QT_MAC_USE_COCOA
-void qt_mac_set_needs_display(QWidget *widget, QRegion region)
-{
-    NSView *theNSView = qt_mac_nativeview_for(widget);
-    if (region.isEmpty()) {
-        [theNSView setNeedsDisplay:YES];
-        return;
-    }
-
-    QVector<QRect> rects = region.rects();
-    for (int i = 0; i<rects.count(); ++i) {
-        const QRect &rect = rects.at(i);
-        NSRect nsrect = NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
-        [theNSView setNeedsDisplayInRect:nsrect];
-    }
-
-}
-#endif
-
 inline static bool updateRedirectedToGraphicsProxyWidget(QWidget *widget, const QRect &rect)
 {
     if (!widget)
@@ -3352,7 +3333,7 @@ void QWidgetPrivate::update_sys(const QRect &r)
 #ifndef QT_MAC_USE_COCOA
             HIViewSetNeedsDisplay(qt_mac_nativeview_for(q), true);
 #else
-	    qt_mac_set_needs_display(q, QRegion());
+            qt_mac_setNeedsDisplayInRect(q, QRegion());
 #endif
         return;
     }
@@ -4928,7 +4909,7 @@ void QWidgetPrivate::finishCocoaMaskSetup()
         [window setOpaque:(extra->imageMask == 0)];
         [window invalidateShadow];
     }
-    qt_mac_set_needs_display(q, QRegion());
+    qt_mac_setNeedsDisplayInRect(q, QRegion());
 }
 #endif
 
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 92e9425..8e09c58 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -268,7 +268,7 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     this->regionToFlush += rgn;
 
     // The actual flushing will be processed in [view drawRect:rect]
-    qt_mac_setneedsdisplay(widget);
+    qt_mac_setNeedsDisplay(widget);
 
     // Unified toolbar hack.
     // We issue a flush call for each QToolBar so they get repainted right after
-- 
cgit v0.12


From 0b1b6859e7127cd68c262e240e305df03a9e0ef5 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Fri, 28 Jan 2011 15:19:33 +0100
Subject: Disable subtractOpaqueSiblings when in the unified toolbar.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the items in the unified toolbar have
non-relevant positions and can't be overshadowed
by another widget, we always paint them.

Reviewed-by: Samuel Rødal
---
 src/gui/kernel/qwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 88348cd..04bc2fb 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2075,7 +2075,7 @@ void QWidgetPrivate::subtractOpaqueSiblings(QRegion &sourceRegion, bool *hasDirt
 {
     Q_Q(const QWidget);
     static int disableSubtractOpaqueSiblings = qgetenv("QT_NO_SUBTRACTOPAQUESIBLINGS").toInt();
-    if (disableSubtractOpaqueSiblings || q->isWindow())
+    if (disableSubtractOpaqueSiblings || q->isWindow() || q->d_func()->isInUnifiedToolbar)
         return;
 
     QRect clipBoundingRect;
-- 
cgit v0.12


From 5aa2ea5ef204caee97de1b9ea6533a5382075147 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Mon, 31 Jan 2011 13:42:38 +0100
Subject: Remove useless variables.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qwidget_p.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 4e91358..921cf03 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -854,9 +854,6 @@ public:
     bool hasOwnContext;
 
     // Unified toolbar variables
-    CGContextRef cgContext;
-    QRegion ut_rg;
-    QPoint ut_pt;
     bool isInUnifiedToolbar;
     QWindowSurface *unifiedSurface;
     QPoint toolbar_offset;
-- 
cgit v0.12


From 988d67957fdb7f5b50c8bff6c70e2ae299f7744c Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 8 Feb 2011 10:35:08 +0100
Subject: Remove useless function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Samuel Rødal
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 5 -----
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 5f52679..36b3e6a 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -92,11 +92,6 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
     }
 }
 
-void QUnifiedToolbarSurface::updateRedirection(QWidget *widget)
-{
-    recursiveRedirect(widget, widget->d_func()->toolbar_offset);
-}
-
 void QUnifiedToolbarSurface::insertToolbar(QWidget *toolbar, const QPoint &offset)
 {
     setGeometry(QRect(QPoint(0, 0), QSize(offset.x() + toolbar->width(), 100))); // FIXME
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index 6e40a17..54f0f8e 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -82,7 +82,6 @@ public:
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
-    void updateRedirection(QWidget *widget);
     void updateToolbarOffset(QWidget *widget);
 
     QPaintDevice *paintDevice();
-- 
cgit v0.12


From e7c3a905637a157d4989682c49b7c5691071eb81 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 8 Feb 2011 10:43:10 +0100
Subject: Force the repaint during live resize.

During live resize on Mac, it is important to keep
up with the resizing of the window, or the
application looks sluggish.

Calling update() is not enough, since we then are
lagging behind the system by going through the
event loop.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoawindowdelegate_mac.mm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index 6ce7b35..55f2db6 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -215,6 +215,11 @@ static void cleanupCocoaWindowDelegate()
         QWidgetPrivate::qt_mac_update_sizer(qwidget);
         [self syncSizeForWidget:qwidget toSize:newSize fromSize:oldSize];
     }
+
+    // We force the repaint to be synchronized with the resize of the window.
+    // Otherwise, the resize looks sluggish because we paint one event loop later.
+    if ([[window contentView] inLiveResize])
+        qwidget->repaint();
 }
 
 - (void)windowDidMove:(NSNotification *)notification
-- 
cgit v0.12


From 7da16ed9888133039c6d7a261fc7c4b61d9b6114 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Mon, 14 Feb 2011 15:29:07 +0100
Subject: Remove useless statements.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Samuel Rødal
---
 src/gui/kernel/qt_cocoa_helpers_mac.mm     | 2 --
 src/gui/painting/qwindowsurface_raster.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 71f59e3..f3e1c9a 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1587,14 +1587,12 @@ void qt_mac_display(QWidget *widget)
 {
     NSView *theNSView = qt_mac_nativeview_for(widget);
     [theNSView display];
-    return;
 }
 
 void qt_mac_setNeedsDisplay(QWidget *widget)
 {
     NSView *theNSView = qt_mac_nativeview_for(widget);
     [theNSView setNeedsDisplay:YES];
-    return;
 }
 
 void qt_mac_setNeedsDisplayInRect(QWidget *widget, QRegion region)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 8e09c58..45111dc 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -256,8 +256,6 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
 #ifdef Q_WS_MAC
 
-    Q_UNUSED(offset);
-
     // This is mainly done for native components like native "open file" dialog.
     if (widget->testAttribute(Qt::WA_DontShowOnScreen)) {
         return;
-- 
cgit v0.12


From 78c5c1cae5f9e100bfb7388f68208406f0db4b42 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Mon, 14 Feb 2011 16:23:00 +0100
Subject: Optimize the rendering path for the unified toolbar.

The over flushing of the toolbar had a huge
performance impact so now we only flush the toolbar
when necessary and moved the rendering out of the
flushing process.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoaview_mac.mm                | 10 +-------
 src/gui/kernel/qwidget.cpp                      | 17 ++++++++++++++
 src/gui/kernel/qwidget_p.h                      |  4 +++-
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 31 +++++++++++++++++++------
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h |  3 ++-
 5 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index e50c401..1fe96f8 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -581,20 +581,12 @@ static int qCocoaViewCount = 0;
 
             } else {
 
-                QUnifiedToolbarSurface *unifiedSurface = dynamic_cast<QUnifiedToolbarSurface *>(qwidgetprivate->unifiedSurface);
+                QUnifiedToolbarSurface *unifiedSurface = qwidgetprivate->unifiedSurface;
                 if (!unifiedSurface || !qwidgetprivate->flushRequested) {
                     qt_mac_release_graphics_context(context);
                     return;
                 }
 
-                // We render the content of the toolbar in the surface.
-                unifiedSurface->updateToolbarOffset(qwidget);
-                QRect beginPaintRect(qwidgetprivate->toolbar_offset.x(), qwidgetprivate->toolbar_offset.y(), qwidget->geometry().width(), qwidget->geometry().height());
-                QRegion beginPaintRegion(beginPaintRect);
-
-                unifiedSurface->beginPaint(beginPaintRegion);
-                qwidget->render(unifiedSurface->paintDevice(), qwidgetprivate->toolbar_offset, QRegion(), QWidget::DrawChildren);
-
                 int areaX = qwidgetprivate->toolbar_offset.x();
                 int areaY = qwidgetprivate->toolbar_offset.y();
                 int areaWidth = qwidget->geometry().width();
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 04bc2fb..84a839f 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -324,6 +324,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
     hasOwnContext = false;
     isInUnifiedToolbar = false;
     unifiedSurface = 0;
+    toolbar_ancestor = 0;
     flushRequested = false;
 #endif // QT_MAC_USE_COCOA
 #ifdef QWIDGET_EXTRA_DEBUG
@@ -10360,6 +10361,10 @@ void QWidget::repaint(const QRect &rect)
         return;
 
     if (hasBackingStoreSupport()) {
+        if (qt_widget_private(this)->isInUnifiedToolbar) {
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
+            return;
+        }
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore) {
             tlwExtra->inRepaint = true;
@@ -10389,6 +10394,10 @@ void QWidget::repaint(const QRegion &rgn)
         return;
 
     if (hasBackingStoreSupport()) {
+        if (qt_widget_private(this)->isInUnifiedToolbar) {
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
+            return;
+        }
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore) {
             tlwExtra->inRepaint = true;
@@ -10446,6 +10455,10 @@ void QWidget::update(const QRect &rect)
     }
 
     if (hasBackingStoreSupport()) {
+        if (qt_widget_private(this)->isInUnifiedToolbar) {
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this);
+            return;
+        }
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
             tlwExtra->backingStore->markDirty(rect, this);
@@ -10470,6 +10483,10 @@ void QWidget::update(const QRegion &rgn)
     }
 
     if (hasBackingStoreSupport()) {
+        if (qt_widget_private(this)->isInUnifiedToolbar) {
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this);
+            return;
+        }
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
             tlwExtra->backingStore->markDirty(rgn, this);
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 921cf03..59cb737 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -79,6 +79,7 @@
 
 #ifdef Q_WS_MAC
 #include <private/qt_mac_p.h>
+#include <private/qunifiedtoolbarsurface_mac_p.h>
 #endif
 
 #if defined(Q_WS_QWS)
@@ -855,8 +856,9 @@ public:
 
     // Unified toolbar variables
     bool isInUnifiedToolbar;
-    QWindowSurface *unifiedSurface;
+    QUnifiedToolbarSurface *unifiedSurface;
     QPoint toolbar_offset;
+    QWidget *toolbar_ancestor;
     bool flushRequested;
 #endif // QT_MAC_USE_COCOA
     void determineWindowClass();
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 36b3e6a..6abcf2c 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -71,7 +71,7 @@ QPaintDevice *QUnifiedToolbarSurface::paintDevice()
     return &d_ptr->image->image;
 }
 
-void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &offset)
+void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, QWidget *parent_toolbar, const QPoint &offset)
 {
     if (object != 0) {
         if (object->isWidgetType()) {
@@ -83,9 +83,10 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
                 widget->d_func()->unifiedSurface = this;
                 widget->d_func()->isInUnifiedToolbar = true;
                 widget->d_func()->toolbar_offset = offset;
+                widget->d_func()->toolbar_ancestor = parent_toolbar;
 
                 for (int i = 0; i < object->children().size(); ++i) {
-                    recursiveRedirect(object->children().at(i), offset);
+                    recursiveRedirect(object->children().at(i), parent_toolbar, offset);
                 }
             }
         }
@@ -95,7 +96,7 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
 void QUnifiedToolbarSurface::insertToolbar(QWidget *toolbar, const QPoint &offset)
 {
     setGeometry(QRect(QPoint(0, 0), QSize(offset.x() + toolbar->width(), 100))); // FIXME
-    recursiveRedirect(toolbar, offset);
+    recursiveRedirect(toolbar, toolbar, offset);
 }
 
 void QUnifiedToolbarSurface::setGeometry(const QRect &rect)
@@ -135,10 +136,10 @@ void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QP
     if (!d->image || rgn.rectCount() == 0)
         return;
 
-    widget->d_func()->flushRequested = true;
-
-    // We call display: directly to avoid flickering in the toolbar.
-    qt_mac_display(widget);
+    if (widget->d_func()->flushRequested) {
+        // We call display: directly to avoid flickering in the toolbar.
+        qt_mac_display(widget);
+    }
 }
 
 void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widget)
@@ -208,6 +209,22 @@ CGContextRef QUnifiedToolbarSurface::imageContext()
     return d->image->cg;
 }
 
+void QUnifiedToolbarSurface::renderToolbar(QWidget *widget, bool forceFlush)
+{
+    QWidget *toolbar = widget->d_func()->toolbar_ancestor;
+
+    updateToolbarOffset(toolbar);
+    QRect beginPaintRect(toolbar->d_func()->toolbar_offset.x(), toolbar->d_func()->toolbar_offset.y(), toolbar->geometry().width(), toolbar->geometry().height());
+    QRegion beginPaintRegion(beginPaintRect);
+
+    beginPaint(beginPaintRegion);
+    toolbar->render(paintDevice(), toolbar->d_func()->toolbar_offset, QRegion(), QWidget::DrawChildren);
+    toolbar->d_func()->flushRequested = true;
+
+    if (forceFlush)
+        flush(toolbar, beginPaintRegion, toolbar->d_func()->toolbar_offset);
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index 54f0f8e..f7ad02e 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -86,10 +86,11 @@ public:
 
     QPaintDevice *paintDevice();
     CGContextRef imageContext();
+    void renderToolbar(QWidget *widget, bool forceFlush = false);
 
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
-    void recursiveRedirect(QObject *widget, const QPoint &offset);
+    void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
 
     Q_DECLARE_PRIVATE(QUnifiedToolbarSurface)
     QScopedPointer<QUnifiedToolbarSurfacePrivate> d_ptr;
-- 
cgit v0.12


From b4079c3d3891331ee635f8578740b8fcf2f06ac5 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 23 Feb 2011 16:33:40 +0100
Subject: Remove useless variable.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qwidget.cpp | 1 -
 src/gui/kernel/qwidget_p.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 51ced44..407af02 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -326,7 +326,6 @@ QWidgetPrivate::QWidgetPrivate(int version)
     drawRectOriginalAdded = false;
     originalDrawMethod = true;
     changeMethods = false;
-    hasOwnContext = false;
     isInUnifiedToolbar = false;
     unifiedSurface = 0;
     toolbar_ancestor = 0;
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 2940d19..492292c 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -857,7 +857,6 @@ public:
     bool originalDrawMethod;
     // Do we need to change the methods?
     bool changeMethods;
-    bool hasOwnContext;
 
     // Unified toolbar variables
     bool isInUnifiedToolbar;
-- 
cgit v0.12


From f41e395e9ebc6db33c21ff082b59f2d7b6d2a3b2 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 23 Feb 2011 17:42:23 +0100
Subject: Move the Mac specific behavior in #ifdef.

Since the other platforms are not aware of the
unified toolbar, we move all the specific behaviors
in #ifdef sections.

Reviewed-by: Denis Dzyubenko
---
 src/gui/kernel/qwidget.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 407af02..5fc9951 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2078,9 +2078,14 @@ void QWidgetPrivate::subtractOpaqueSiblings(QRegion &sourceRegion, bool *hasDirt
 {
     Q_Q(const QWidget);
     static int disableSubtractOpaqueSiblings = qgetenv("QT_NO_SUBTRACTOPAQUESIBLINGS").toInt();
-    if (disableSubtractOpaqueSiblings || q->isWindow() || q->d_func()->isInUnifiedToolbar)
+    if (disableSubtractOpaqueSiblings || q->isWindow())
         return;
 
+#ifdef QT_MAC_USE_COCOA
+    if (q->d_func()->isInUnifiedToolbar)
+        return;
+#endif // QT_MAC_USE_COCOA
+
     QRect clipBoundingRect;
     bool dirtyClipBoundingRect = true;
 
@@ -10373,10 +10378,12 @@ void QWidget::repaint(const QRect &rect)
         return;
 
     if (hasBackingStoreSupport()) {
+#ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
             qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
             return;
         }
+#endif // QT_MAC_USE_COCOA
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore) {
             tlwExtra->inRepaint = true;
@@ -10406,10 +10413,12 @@ void QWidget::repaint(const QRegion &rgn)
         return;
 
     if (hasBackingStoreSupport()) {
+#ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
             qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
             return;
         }
+#endif // QT_MAC_USE_COCOA
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore) {
             tlwExtra->inRepaint = true;
@@ -10467,10 +10476,12 @@ void QWidget::update(const QRect &rect)
     }
 
     if (hasBackingStoreSupport()) {
+#ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
             qt_widget_private(this)->unifiedSurface->renderToolbar(this);
             return;
         }
+#endif // QT_MAC_USE_COCOA
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
             tlwExtra->backingStore->markDirty(rect, this);
@@ -10495,10 +10506,12 @@ void QWidget::update(const QRegion &rgn)
     }
 
     if (hasBackingStoreSupport()) {
+#ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
             qt_widget_private(this)->unifiedSurface->renderToolbar(this);
             return;
         }
+#endif // QT_MAC_USE_COCOA
         QTLWExtra *tlwExtra = window()->d_func()->maybeTopData();
         if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
             tlwExtra->backingStore->markDirty(rgn, this);
-- 
cgit v0.12


From 2b9e7bcede5ca6ba9de2534839244cc621f17e1c Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Thu, 24 Feb 2011 16:36:44 +0100
Subject: Add the ability to remove a toolbar from the unified toolbar.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows to toggle the unified look of the
toolbar. This is useful for apps going fullscreen
since we have to turn the unified look off when
entering fullscreen mode.

Reviewed-by: Samuel Rødal
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 26 +++++++++++++++++++++++++
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h |  5 ++++-
 src/gui/widgets/qmainwindowlayout_mac.mm        |  6 +++---
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 6abcf2c..87206f3 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -99,6 +99,32 @@ void QUnifiedToolbarSurface::insertToolbar(QWidget *toolbar, const QPoint &offse
     recursiveRedirect(toolbar, toolbar, offset);
 }
 
+// We basically undo what we set in recursiveRedirect().
+void QUnifiedToolbarSurface::recursiveRemoval(QObject *object)
+{
+    if (object != 0) {
+        if (object->isWidgetType()) {
+            QWidget *widget = qobject_cast<QWidget *>(object);
+
+            if (!(widget->windowType() & Qt::Window)) {
+                widget->d_func()->unifiedSurface = 0;
+                widget->d_func()->isInUnifiedToolbar = false;
+                widget->d_func()->toolbar_offset = QPoint();
+                widget->d_func()->toolbar_ancestor = 0;
+
+                for (int i = 0; i < object->children().size(); ++i) {
+                    recursiveRemoval(object->children().at(i));
+                }
+            }
+        }
+    }
+}
+
+void QUnifiedToolbarSurface::removeToolbar(QToolBar *toolbar)
+{
+    recursiveRemoval(toolbar);
+}
+
 void QUnifiedToolbarSurface::setGeometry(const QRect &rect)
 {
     QWindowSurface::setGeometry(rect);
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index f7ad02e..99839fa 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -55,6 +55,7 @@
 
 #include <private/qwindowsurface_raster_p.h>
 #include <QWidget>
+#include <QToolBar>
 #include <private/qwidget_p.h>
 #include <private/qnativeimage_p.h>
 
@@ -82,15 +83,17 @@ public:
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
+    void removeToolbar(QToolBar *toolbar);
     void updateToolbarOffset(QWidget *widget);
+    void renderToolbar(QWidget *widget, bool forceFlush = false);
 
     QPaintDevice *paintDevice();
     CGContextRef imageContext();
-    void renderToolbar(QWidget *widget, bool forceFlush = false);
 
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
     void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
+    void recursiveRemoval(QObject *object);
 
     Q_DECLARE_PRIVATE(QUnifiedToolbarSurface)
     QScopedPointer<QUnifiedToolbarSurfacePrivate> d_ptr;
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index e428ffc..761a433 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -356,10 +356,10 @@ void QMainWindowLayout::updateHIToolBarStatus()
         while (!qtoolbarsInUnifiedToolbarList.isEmpty()) {
             // Should shrink the list by one every time.
             QToolBar *toolbar = qtoolbarsInUnifiedToolbarList.first();
-            layoutState.mainWindow->addToolBar(Qt::TopToolBarArea, toolbar);
 #if defined(QT_MAC_USE_COCOA)
-            toolbar->d_func()->isInUnifiedToolbar = false;
+            unifiedSurface->removeToolbar(toolbar);
 #endif
+            layoutState.mainWindow->addToolBar(Qt::TopToolBarArea, toolbar);
         }
         macWindowToolbarSet(qt_mac_window_for(layoutState.mainWindow), 0);
     } else {
@@ -393,7 +393,7 @@ void QMainWindowLayout::insertIntoMacToolbar(QToolBar *before, QToolBar *toolbar
         return;
 
 #if defined(QT_MAC_USE_COCOA)
-    // toolbar will now become native (if not allready) since we need
+    // toolbar will now become native (if not already) since we need
     // an nsview for it inside the corresponding NSToolbarItem.
     // Setting isInUnifiedToolbar will (among other things) stop alien
     // siblings from becoming native when this happends since the toolbar
-- 
cgit v0.12


From d524e983c60ba59f3c65d811ec92f02c97d1a8ab Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Tue, 15 Mar 2011 14:48:49 +0100
Subject: Change the way the unified toolbar is flushed.

The flushing of the unified toolbar is no
longer tied to the main window, making it more
flexible.

Task-number: QTBUG-17754
Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoawindowdelegate_mac.mm      | 18 +++++++++++++-
 src/gui/kernel/qwidget.cpp                      | 14 +++++++++--
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 31 +++++++++++++------------
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h |  4 ++--
 src/gui/painting/qwindowsurface_raster.cpp      | 20 +++-------------
 5 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index 9e7aa58..1faf068 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -48,6 +48,9 @@
 #include <qlayout.h>
 #include <qcoreapplication.h>
 #include <qmenubar.h>
+#include <QMainWindow>
+#include <QToolBar>
+#include <private/qmainwindowlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 extern QWidgetData *qt_qwidget_data(QWidget *); // qwidget.cpp
@@ -218,8 +221,21 @@ static void cleanupCocoaWindowDelegate()
 
     // We force the repaint to be synchronized with the resize of the window.
     // Otherwise, the resize looks sluggish because we paint one event loop later.
-    if ([[window contentView] inLiveResize])
+    if ([[window contentView] inLiveResize]) {
         qwidget->repaint();
+
+        // We need to repaint the toolbar as well.
+        QMainWindow* mWindow = qobject_cast<QMainWindow*>(qwidget->window());
+        if (mWindow) {
+            QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout());
+            QList<QToolBar *> toolbarList = mLayout->qtoolbarsInUnifiedToolbarList;
+
+            for (int i = 0; i < toolbarList.size(); ++i) {
+                QToolBar* toolbar = toolbarList.at(i);
+                toolbar->repaint();
+            }
+        }
+    }
 }
 
 - (void)windowDidMove:(NSNotification *)notification
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 5fc9951..198d4e5 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1367,6 +1367,16 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
     QApplication::postEvent(q, new QEvent(QEvent::PolishRequest));
 
     extraPaintEngine = 0;
+
+#ifdef QT_MAC_USE_COCOA
+    // If we add a child to the unified toolbar, we have to redirect the painting.
+    if (parentWidget && parentWidget->d_func() && parentWidget->d_func()->isInUnifiedToolbar) {
+        if (parentWidget->d_func()->unifiedSurface) {
+            QWidget *toolbar = parentWidget->d_func()->toolbar_ancestor;
+            parentWidget->d_func()->unifiedSurface->recursiveRedirect(toolbar, toolbar, toolbar->d_func()->toolbar_offset);
+        }
+    }
+#endif // QT_MAC_USE_COCOA
 }
 
 
@@ -10478,7 +10488,7 @@ void QWidget::update(const QRect &rect)
     if (hasBackingStoreSupport()) {
 #ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
-            qt_widget_private(this)->unifiedSurface->renderToolbar(this);
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
             return;
         }
 #endif // QT_MAC_USE_COCOA
@@ -10508,7 +10518,7 @@ void QWidget::update(const QRegion &rgn)
     if (hasBackingStoreSupport()) {
 #ifdef QT_MAC_USE_COCOA
         if (qt_widget_private(this)->isInUnifiedToolbar) {
-            qt_widget_private(this)->unifiedSurface->renderToolbar(this);
+            qt_widget_private(this)->unifiedSurface->renderToolbar(this, true);
             return;
         }
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 87206f3..0993b22 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -106,16 +106,18 @@ void QUnifiedToolbarSurface::recursiveRemoval(QObject *object)
         if (object->isWidgetType()) {
             QWidget *widget = qobject_cast<QWidget *>(object);
 
-            if (!(widget->windowType() & Qt::Window)) {
-                widget->d_func()->unifiedSurface = 0;
-                widget->d_func()->isInUnifiedToolbar = false;
-                widget->d_func()->toolbar_offset = QPoint();
-                widget->d_func()->toolbar_ancestor = 0;
+            // If it's a pop-up or something similar, we don't redirect it.
+            if (widget->windowType() & Qt::Window)
+                return;
+
+            widget->d_func()->unifiedSurface = 0;
+            widget->d_func()->isInUnifiedToolbar = false;
+            widget->d_func()->toolbar_offset = QPoint();
+            widget->d_func()->toolbar_ancestor = 0;
+        }
 
-                for (int i = 0; i < object->children().size(); ++i) {
-                    recursiveRemoval(object->children().at(i));
-                }
-            }
+        for (int i = 0; i < object->children().size(); ++i) {
+            recursiveRemoval(object->children().at(i));
         }
     }
 }
@@ -154,12 +156,11 @@ void QUnifiedToolbarSurface::updateToolbarOffset(QWidget *widget)
     mlayout->updateUnifiedToolbarOffset();
 }
 
-void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &offset)
+void QUnifiedToolbarSurface::flush(QWidget *widget)
 {
     Q_D(QUnifiedToolbarSurface);
-    Q_UNUSED(offset);
 
-    if (!d->image || rgn.rectCount() == 0)
+    if (!d->image)
         return;
 
     if (widget->d_func()->flushRequested) {
@@ -173,7 +174,7 @@ void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widge
     Q_D(QUnifiedToolbarSurface);
 
     int width = geometry().width();
-    int height = geometry().height();
+    int height = 100; // FIXME
     if (d->image) {
         width = qMax(d->image->width(), width);
         height = qMax(d->image->height(), height);
@@ -244,11 +245,11 @@ void QUnifiedToolbarSurface::renderToolbar(QWidget *widget, bool forceFlush)
     QRegion beginPaintRegion(beginPaintRect);
 
     beginPaint(beginPaintRegion);
-    toolbar->render(paintDevice(), toolbar->d_func()->toolbar_offset, QRegion(), QWidget::DrawChildren);
+    toolbar->render(paintDevice(), toolbar->d_func()->toolbar_offset, QRegion(toolbar->geometry()), QWidget::DrawChildren);
     toolbar->d_func()->flushRequested = true;
 
     if (forceFlush)
-        flush(toolbar, beginPaintRegion, toolbar->d_func()->toolbar_offset);
+        flush(toolbar);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index 99839fa..8a552fb 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -79,20 +79,20 @@ public:
     QUnifiedToolbarSurface(QWidget *widget);
     ~QUnifiedToolbarSurface();
 
-    void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
+    void flush(QWidget *widget);
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
     void removeToolbar(QToolBar *toolbar);
     void updateToolbarOffset(QWidget *widget);
     void renderToolbar(QWidget *widget, bool forceFlush = false);
+    void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
 
     QPaintDevice *paintDevice();
     CGContextRef imageContext();
 
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
-    void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
     void recursiveRemoval(QObject *object);
 
     Q_DECLARE_PRIVATE(QUnifiedToolbarSurface)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 27d8cb9..8170b7a 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -277,35 +277,21 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
 #ifdef Q_WS_MAC
 
+    Q_UNUSED(offset);
+
     // This is mainly done for native components like native "open file" dialog.
     if (widget->testAttribute(Qt::WA_DontShowOnScreen)) {
         return;
     }
 
 #ifdef QT_MAC_USE_COCOA
+
     this->needsFlush = true;
     this->regionToFlush += rgn;
 
     // The actual flushing will be processed in [view drawRect:rect]
     qt_mac_setNeedsDisplay(widget);
 
-    // Unified toolbar hack.
-    // We issue a flush call for each QToolBar so they get repainted right after
-    // the main window.
-    QMainWindow* mWindow = qobject_cast<QMainWindow*>(widget->window());
-    if (mWindow) {
-        QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout());
-        QList<QToolBar *> toolbarList = mLayout->qtoolbarsInUnifiedToolbarList;
-
-        for (int i = 0; i < toolbarList.size(); ++i) {
-            QToolBar* toolbar = toolbarList.at(i);
-            if (mLayout->toolBarArea(toolbar) == Qt::TopToolBarArea) {
-                QWidget* tbWidget = (QWidget*) toolbar;
-                if (tbWidget->d_func()->unifiedSurface)
-                    tbWidget->d_func()->unifiedSurface->flush(tbWidget, rgn, offset);
-            }
-        }
-    }
 #else
     // Get a context for the widget.
     CGContextRef context;
-- 
cgit v0.12


From cc994cf5a10a4ab31e37ae8712b9cd1b37878e79 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 16 Mar 2011 13:45:42 +0100
Subject: Remove the check on flushRequested.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The check on flushRequested was needed since we
were flushing the toolbar with the main window,
but the flushing is now independent so we don't
need it anymore.
It is now making us skip some flushing.

Reviewed-by: Samuel Rødal
---
 src/gui/kernel/qcocoaview_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 43eb072..54e7e3e 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -299,7 +299,7 @@ static int qCocoaViewCount = 0;
             } else {
 
                 QUnifiedToolbarSurface *unifiedSurface = qwidgetprivate->unifiedSurface;
-                if (!unifiedSurface || !qwidgetprivate->flushRequested) {
+                if (!unifiedSurface) {
                     qt_mac_release_graphics_context(context);
                     return;
                 }
-- 
cgit v0.12


From d149125e0b539ff13f77cb2a67194ac3d6e331a0 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 16 Mar 2011 13:53:30 +0100
Subject: Add an overloading function to flush().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the case of the unified toolbar, we don't need
as much arguments for flush().
So we overload flush() to only take one
argument, the widget.

Reviewed-by: Samuel Rødal
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 8 ++++++++
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 63364f3..9913c9a 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -156,6 +156,14 @@ void QUnifiedToolbarSurface::updateToolbarOffset(QWidget *widget)
     mlayout->updateUnifiedToolbarOffset();
 }
 
+void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
+{
+    Q_UNUSED(region);
+    Q_UNUSED(offset);
+
+    this->flush(widget);
+}
+
 void QUnifiedToolbarSurface::flush(QWidget *widget)
 {
     Q_D(QUnifiedToolbarSurface);
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index b0075b6..0a7ebf1 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -80,6 +80,7 @@ public:
     ~QUnifiedToolbarSurface();
 
     void flush(QWidget *widget);
+    void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
-- 
cgit v0.12