Changeset 71034 in vbox for trunk

Timestamp:

Feb 15, 2018 5:26:40 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Runtime UI: Framebuffer: More rework for painting routines.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -1349 +1349 @@
 void UIFrameBufferPrivate::paintDefault(QPaintEvent *pEvent)
 {
-    /* Scaled image is NULL by default: */
-    QImage scaledImage;
-    /* But if scale-factor is set and current image is NOT null: */
-    if (m_scaledSize.isValid() && !m_image.isNull())
-    {
-        /* We are doing a deep copy of the image to make sure it will not be
-         * detached during scale process, otherwise we can get a frozen frame-buffer. */
-        scaledImage = m_image.copy();
-        /* And scaling the image to predefined scale-factor: */
+    /* Make sure cached image is valid: */
+    if (m_image.isNull())
+        return;
+
+    /* First we take the cached image as the source: */
+    QImage *pSourceImage = &m_image;
+
+    /* But if scaled size is set: */
+    if (m_scaledSize.isValid())
+    {
+        /* We scale the image to requested size and retain it
+         * by making heap shallow copy of that temporary object: */
         switch (m_pMachineView->visualStateType())
         {
             case UIVisualStateType_Scale:
-                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                                 transformationMode(scalingOptimizationType()));
+                pSourceImage = new QImage(pSourceImage->scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                               transformationMode(scalingOptimizationType())));
                 break;
             default:
-                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                                 transformationMode(scalingOptimizationType(), m_dScaleFactor));
+                pSourceImage = new QImage(pSourceImage->scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                               transformationMode(scalingOptimizationType(), m_dScaleFactor)));
                 break;
         }
     }
-    /* Finally we are choosing image to paint from: */
-    const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
     /* Prepare the base and hidpi paint rectangles: */
@@ -1385 +1386 @@
 
     /* Make sure hidpi paint rectangle is within the image boundary: */
-    paintRectHiDPI = paintRectHiDPI.intersected(sourceImage.rect());
+    paintRectHiDPI = paintRectHiDPI.intersected(pSourceImage->rect());
     if (paintRectHiDPI.isEmpty())
         return;
@@ -1400 +1401 @@
 
     /* Draw hidpi image rectangle: */
-    drawImageRect(painter, sourceImage, paintRectHiDPI,
+    drawImageRect(painter, *pSourceImage, paintRectHiDPI,
                   m_pMachineView->contentsX(), m_pMachineView->contentsY(),
                   useUnscaledHiDPIOutput(),
@@ -1407 +1408 @@
 #endif
                   devicePixelRatio());
+
+    /* If scaled size is set: */
+    if (m_scaledSize.isValid())
+    {
+        /* Wipe out copied image: */
+        delete pSourceImage;
+        pSourceImage = 0;
+    }
 }
 
 void UIFrameBufferPrivate::paintSeamless(QPaintEvent *pEvent)
 {
-    /* Scaled image is NULL by default: */
-    QImage scaledImage;
-    /* But if scale-factor is set and current image is NOT null: */
-    if (m_scaledSize.isValid() && !m_image.isNull())
-    {
-        /* We are doing a deep copy of the image to make sure it will not be
-         * detached during scale process, otherwise we can get a frozen frame-buffer. */
-        scaledImage = m_image.copy();
-        /* And scaling the image to predefined scale-factor: */
+    /* Make sure cached image is valid: */
+    if (m_image.isNull())
+        return;
+
+    /* First we take the cached image as the source: */
+    QImage *pSourceImage = &m_image;
+
+    /* But if scaled size is set: */
+    if (m_scaledSize.isValid())
+    {
+        /* We scale the image to requested size and retain it
+         * by making heap shallow copy of that temporary object: */
         switch (m_pMachineView->visualStateType())
         {
             case UIVisualStateType_Scale:
-                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                                 transformationMode(scalingOptimizationType()));
+                pSourceImage = new QImage(pSourceImage->scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                               transformationMode(scalingOptimizationType())));
                 break;
             default:
-                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                                 transformationMode(scalingOptimizationType(), m_dScaleFactor));
+                pSourceImage = new QImage(pSourceImage->scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                               transformationMode(scalingOptimizationType(), m_dScaleFactor)));
                 break;
         }
     }
-    /* Finally we are choosing image to paint from: */
-    const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
     /* Prepare the base and hidpi paint rectangles: */
@@ -1447 +1457 @@
 
     /* Make sure hidpi paint rectangle is within the image boundary: */
-    paintRectHiDPI = paintRectHiDPI.intersected(sourceImage.rect());
+    paintRectHiDPI = paintRectHiDPI.intersected(pSourceImage->rect());
     if (paintRectHiDPI.isEmpty())
         return;
@@ -1482 +1492 @@
 
     /* Draw hidpi image rectangle: */
-    drawImageRect(painter, sourceImage, paintRectHiDPI,
+    drawImageRect(painter, *pSourceImage, paintRectHiDPI,
                   m_pMachineView->contentsX(), m_pMachineView->contentsY(),
                   useUnscaledHiDPIOutput(),
@@ -1489 +1499 @@
 #endif
                   devicePixelRatio());
+
+    /* If scaled size is set: */
+    if (m_scaledSize.isValid())
+    {
+        /* Wipe out copied image: */
+        delete pSourceImage;
+        pSourceImage = 0;
+    }
 }