Changeset 90798 in vbox

Timestamp:

Aug 23, 2021 3:59:23 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Runtime UI / UIMachineView: A bit of sanity checks for frame-buffer presence.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (20 diffs)

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

@@ -283 +283 @@
     if (   !isFullscreenOrSeamless()
         && uisession()->isGuestSupportsGraphics()
-        && (   (int)m_pFrameBuffer->width() != size.width()
-            || (int)m_pFrameBuffer->height() != size.height()
+        && (   (int)frameBuffer()->width() != size.width()
+            || (int)frameBuffer()->height() != size.height()
             || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
         storeGuestSizeHint(size);
@@ -295 +295 @@
         {
             /* Do not send a hint if nothing has changed to prevent the guest being notified about its own changes: */
-            if ((int)m_pFrameBuffer->width() != size.width() || (int)m_pFrameBuffer->height() != size.height())
+            if ((int)frameBuffer()->width() != size.width() || (int)frameBuffer()->height() != size.height())
             {
                 LogRel(("GUI: UIMachineView::sltPerformGuestResize: Auto-pilot resizing screen %d as %dx%d\n",
@@ -348 +348 @@
     {
         /* Do not send a hint if nothing has changed to prevent the guest being notified about its own changes: */
-        if ((int)m_pFrameBuffer->width() != size.width() || (int)m_pFrameBuffer->height() != size.height())
+        if ((int)frameBuffer()->width() != size.width() || (int)frameBuffer()->height() != size.height())
         {
             LogRel(("GUI: UIMachineView::sltPerformGuestResize: Sending guest size-hint to screen %d as %dx%d\n",
@@ -402 +402 @@
         if (   !isFullscreenOrSeamless()
             && uisession()->isGuestSupportsGraphics()
-            && (   m_pFrameBuffer->width() != uWidth
-                || m_pFrameBuffer->height() != uHeight
+            && (   frameBuffer()->width() != uWidth
+                || frameBuffer()->height() != uHeight
                 || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
             storeGuestSizeHint(QSize(uWidth, uHeight));
@@ -453 +453 @@
     if (   !isFullscreenOrSeamless()
         && uisession()->isGuestSupportsGraphics()
-        && (   (int)m_pFrameBuffer->width() != size.width()
-            || (int)m_pFrameBuffer->height() != size.height()
+        && (   (int)frameBuffer()->width() != size.width()
+            || (int)frameBuffer()->height() != size.height()
             || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
         storeGuestSizeHint(size);
@@ -473 +473 @@
 void UIMachineView::sltHandleNotifyChange(int iWidth, int iHeight)
 {
+    /* Sanity check: */
+    if (!frameBuffer())
+        return;
+
     LogRel2(("GUI: UIMachineView::sltHandleNotifyChange: Screen=%d, Size=%dx%d\n",
              (unsigned long)m_uScreenId, iWidth, iHeight));
@@ -570 +574 @@
 void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeight)
 {
+    /* Sanity check: */
+    if (!frameBuffer())
+        return;
+
     /* Prepare corresponding viewport part: */
     QRect rect(iX, iY, iWidth, iHeight);
@@ -705 +713 @@
         case KMachineState_TeleportingPausedVM:
         {
-            if (   m_pFrameBuffer
+            if (   frameBuffer()
                 && (   state           != KMachineState_TeleportingPausedVM
                     || m_previousState != KMachineState_Teleporting))
@@ -741 +749 @@
                 m_previousState == KMachineState_Restoring)
             {
-                if (m_pFrameBuffer)
+                if (frameBuffer())
                 {
                     /* Reset pause-pixmap: */
@@ -861 +869 @@
         /* Create new frame-buffer: */
         m_pFrameBuffer = new UIFrameBuffer;
-        m_pFrameBuffer->init(this);
+        frameBuffer()->init(this);
 
         /* Take scaling optimization type into account: */
-        m_pFrameBuffer->setScalingOptimizationType(gEDataManager->scalingOptimizationType(uiCommon().managedVMUuid()));
+        frameBuffer()->setScalingOptimizationType(gEDataManager->scalingOptimizationType(uiCommon().managedVMUuid()));
 
         /* Acquire selected scale-factor: */
@@ -876 +884 @@
 
         /* Assign frame-buffer with new values: */
-        m_pFrameBuffer->setDevicePixelRatio(dDevicePixelRatioFormal);
-        m_pFrameBuffer->setDevicePixelRatioActual(dDevicePixelRatioActual);
-        m_pFrameBuffer->setScaleFactor(dScaleFactor);
-        m_pFrameBuffer->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+        frameBuffer()->setDevicePixelRatio(dDevicePixelRatioFormal);
+        frameBuffer()->setDevicePixelRatioActual(dDevicePixelRatioActual);
+        frameBuffer()->setScaleFactor(dScaleFactor);
+        frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
 
         /* Propagate the scale-factor related attributes to 3D service if necessary: */
@@ -899 +907 @@
 
         /* Perform frame-buffer rescaling: */
-        m_pFrameBuffer->performRescale();
+        frameBuffer()->performRescale();
 
         /* Associate uisession with frame-buffer finally: */
-        uisession()->setFrameBuffer(screenId(), m_pFrameBuffer);
+        uisession()->setFrameBuffer(screenId(), frameBuffer());
     }
 
     /* Make sure frame-buffer was prepared: */
-    AssertReturnVoid(m_pFrameBuffer);
+    AssertReturnVoid(frameBuffer());
 
     /* Reattach to IDisplay: */
-    m_pFrameBuffer->detach();
-    m_pFrameBuffer->attach();
+    frameBuffer()->detach();
+    frameBuffer()->attach();
 
     /* Calculate frame-buffer size: */
@@ -1031 +1039 @@
 {
     /* Make sure framebuffer assigned at all: */
-    if (!m_pFrameBuffer)
+    if (!frameBuffer())
         return;
 
     /* Make sure proper framebuffer assigned: */
-    AssertReturnVoid(m_pFrameBuffer == uisession()->frameBuffer(screenId()));
+    AssertReturnVoid(frameBuffer() == uisession()->frameBuffer(screenId()));
 
     /* Mark framebuffer as unused: */
     LogRelFlow(("GUI: UIMachineView::cleanupFrameBuffer: Stop EMT callbacks accepting for screen: %d\n", screenId()));
-    m_pFrameBuffer->setMarkAsUnused(true);
+    frameBuffer()->setMarkAsUnused(true);
 
     /* Process pending framebuffer events: */
@@ -1049 +1057 @@
      * to ensure 3D gets notified of view being destroyed... */
     if (console().isOk() && !display().isNull())
-        m_pFrameBuffer->detach();
+        frameBuffer()->detach();
 
     /* Detach framebuffer from view: */
-    m_pFrameBuffer->setView(NULL);
+    frameBuffer()->setView(NULL);
 }
 
@@ -1123 +1131 @@
 
     /* Get frame-buffer size-hint: */
-    QSize size(m_pFrameBuffer->width(), m_pFrameBuffer->height());
+    QSize size(frameBuffer()->width(), frameBuffer()->height());
 
     /* Take the scale-factor(s) into account: */
@@ -1152 +1160 @@
 int UIMachineView::contentsWidth() const
 {
-    return m_pFrameBuffer->width();
+    return frameBuffer()->width();
 }
 
 int UIMachineView::contentsHeight() const
 {
-    return m_pFrameBuffer->height();
+    return frameBuffer()->height();
 }
 
@@ -1288 +1296 @@
 {
     /* Prepare a screen-shot: */
-    QImage screenShot = QImage(m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
+    QImage screenShot = QImage(frameBuffer()->width(), frameBuffer()->height(), QImage::Format_RGB32);
     /* Which will be a 'black image' by default. */
     screenShot.fill(0);
@@ -1511 +1519 @@
 
     /* Create the image ref out of the frame-buffer: */
-    return frameBuffertoCGImageRef(m_pFrameBuffer);
+    return frameBuffertoCGImageRef(frameBuffer());
 }
 
@@ -1582 +1590 @@
                 /* Notify framebuffer about viewport resize: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                if (m_pFrameBuffer)
-                    m_pFrameBuffer->viewportResized(pResizeEvent);
+                if (frameBuffer())
+                    frameBuffer()->viewportResized(pResizeEvent);
                 /* Update console's display viewport and 3D overlay: */
                 updateViewport();
@@ -1696 +1704 @@
 
     /* Delegate the paint function to the UIFrameBuffer interface: */
-    if (m_pFrameBuffer)
-        m_pFrameBuffer->handlePaintEvent(pPaintEvent);
+    if (frameBuffer())
+        frameBuffer()->handlePaintEvent(pPaintEvent);
 #ifdef VBOX_WS_MAC
     /* Update the dock icon if we are in the running state: */