Revert 99480d5420c0beea6771be582c039b550a4461f5

The Mac OS X platform plugin has been fixed so that this
hack is no longer needed. Not to mention that it breaks on XCB.

We keep the warning about bad exposes from the plugin in debug
mode. These are still useful for tracking down future bugs.

Task-number: QTBUG-35143
Change-Id: I5125f7ae2b7fd77c55e9a29b10aa5434598a9ea9
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

2 files changed, 0 insertions, 18 deletions

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 850a463c3e..acd07cf6cd 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -817,7 +817,6 @@ void QSGThreadedRenderLoop::show(QQuickWindow *window)
     win.thread = new QSGRenderThread(this, QQuickWindowPrivate::get(window)->context);
     win.timerId = 0;
     win.updateDuringSync = false;
-    win.gotBrokenExposeFromPlatformPlugin = false;
     m_windows << win;
 }
 
@@ -883,19 +882,6 @@ void QSGThreadedRenderLoop::exposureChanged(QQuickWindow *window)
     }
 }
 
-void QSGThreadedRenderLoop::resize(QQuickWindow *window)
-{
-    Window *w = windowFor(m_windows, window);
-    if (w
-        && w->gotBrokenExposeFromPlatformPlugin
-        && window->width() > 0 && window->height() > 0
-        && w->window->geometry().intersects(w->window->screen()->availableGeometry())) {
-        w->gotBrokenExposeFromPlatformPlugin = false;
-        handleExposure(w);
-    }
-}
-
-
 /*!
     Will post an event to the render thread that this window should
     start to render.
@@ -909,8 +895,6 @@ void QSGThreadedRenderLoop::handleExposure(Window *w)
 #ifndef QT_NO_DEBUG
         qWarning("QSGThreadedRenderLoop: expose event received for window with invalid geometry.");
 #endif
-        w->gotBrokenExposeFromPlatformPlugin = true;
-        return;
     }
 
     // Because we are going to bind a GL context to it, make sure it
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
index 844d180788..5943d0bd08 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h
+++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
@@ -60,7 +60,6 @@ public:
 
     void show(QQuickWindow *window);
     void hide(QQuickWindow *window);
-    void resize(QQuickWindow *window);
 
     void windowDestroyed(QQuickWindow *window);
     void exposureChanged(QQuickWindow *window);
@@ -90,7 +89,6 @@ private:
         QSGRenderThread *thread;
         int timerId;
         uint updateDuringSync : 1;
-        uint gotBrokenExposeFromPlatformPlugin : 1;
     };
 
     friend class QSGRenderThread;