Merge pull request #8 from sailfishos/jb55286

Revert Drop rendering guards until engine statuses are reported correctly. JB#55286 OMP#JOLLA-310
sailfishos · Sep 16, 2021 · 30850d2 · 30850d2
2 parents b1cb893 + 8976d9d
commit 30850d2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/src/qmozwindow.cpp b/src/qmozwindow.cpp
@@ -68,10 +68,7 @@ void QMozWindow::getPlatformImage(const std::function<void(void *image, int widt
 
 void QMozWindow::suspendRendering()
 {
-    // Revert this in context of JB#55286
-#if 0
     d->mWindow->SuspendRendering();
-#endif
 }
 
 void QMozWindow::resumeRendering()

diff --git a/src/qmozwindow_p.cpp b/src/qmozwindow_p.cpp
@@ -178,17 +178,12 @@ void QMozWindowPrivate::getGLXContext(void *&context, void *&surface)
 
 bool QMozWindowPrivate::setReadyToPaint(bool ready)
 {
-    Q_UNUSED(ready);
-    return true;
-    // Revert this in context of JB#55286
-#if 0
     QMutexLocker lock(&mReadyToPaintMutex);
     if (mReadyToPaint != ready) {
         mReadyToPaint = ready;
         return true;
     }
     return false;
-#endif
 }
 
 void QMozWindowPrivate::WindowInitialized()
@@ -219,9 +214,6 @@ void QMozWindowPrivate::CompositingFinished()
 
 bool QMozWindowPrivate::PreRender()
 {
-    return true;
-#if 0
     QMutexLocker lock(&mReadyToPaintMutex);
     return mReadyToPaint;
-#endif
 }