Revert "Client: Full implementation for frame callbacks"

This caused regressions because QtQuick depends on swapBuffers for throttling
animations. We probably need to emulate a blocking swapBuffers and continue
after a timeout, but until we have a patch for this, revert this to avoid
releasing a regression.

This brings back the bug with a frozen event loop when a surface is waiting for
a frame callback, but this is preferable to a regression.

This reverts commit 1dc85b95ab0adc1e805d059e2c35c671ef790011.

Fixes: QTBUG-72578
Change-Id: If6435a947aae5e9fd775404649a392bfafe9130a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 1 insertions, 8 deletions

diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index e5838d231..56ebd3cc6 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -191,10 +191,7 @@ public:
 
     bool startSystemMove(const QPoint &pos) override;
 
-    void timerEvent(QTimerEvent *event) override;
     void requestUpdate() override;
-    void handleUpdate();
-    void deliverUpdateRequest() override;
 
 public slots:
     void applyConfigure();
@@ -214,14 +211,10 @@ protected:
     Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
 
     WId mWindowId;
-    bool mWaitingForFrameCallback = false;
+    bool mWaitingForFrameSync = false;
     struct ::wl_callback *mFrameCallback = nullptr;
     QWaitCondition mFrameSyncWait;
 
-    // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
-    bool mWaitingForUpdate = false;
-    int mFallbackUpdateTimerId = -1;
-
     QMutex mResizeLock;
     bool mWaitingToApplyConfigure = false;
     bool mCanResize = true;