Changeset 51537 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 4, 2014 5:28:52 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Frame-buffer: Remove *fallback* protection from paintEvent, expecting it will be provided from the Main side.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIFrameBuffer.h (modified) (1 diff)

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

@@ -526 +526 @@
         m_iHeight = iHeight;
 
-        /* And go fallback: */
-        goFallback();
+        /* And recreate fallback buffer: */
+        m_image = QImage(m_iWidth, m_iHeight, QImage::Format_RGB32);
+        m_image.fill(0);
     }
     /* If source-bitmap valid: */
@@ -602 +603 @@
         /* And return immediately: */
         return;
-    }
-
-    /* If the machine is NOT in 'running', 'paused' or 'saving' state,
-     * the link between the framebuffer and the video memory is broken.
-     * We should go fallback in that case.
-     * We should acquire actual machine-state to exclude
-     * situations when the state was changed already but
-     * GUI didn't received event about that or didn't processed it yet. */
-    KMachineState machineState = m_pMachineView->uisession()->session().GetConsole().GetState();
-    if (/* running */
-           machineState != KMachineState_Running
-        && machineState != KMachineState_Teleporting
-        && machineState != KMachineState_LiveSnapshotting
-        && machineState != KMachineState_DeletingSnapshotOnline
-        /* paused */
-        && machineState != KMachineState_Paused
-        && machineState != KMachineState_TeleportingPausedVM
-        /* saving */
-        && machineState != KMachineState_Saving
-        /* guru */
-        && machineState != KMachineState_Stuck
-        )
-    {
-        LogRel(("UIFrameBuffer::paintEvent: "
-                "Using FALLBACK buffer due to machine-state become invalid: "
-                "%d.\n", (int)machineState));
-
-        /* Go fallback: */
-        goFallback();
     }
 
@@ -874 +846 @@
 }
 
-void UIFrameBuffer::goFallback()
-{
-    /* We are going for FALLBACK buffer when:
-     * 1. Display did not provide the source-bitmap;
-     * 2. or the machine is in the state which breaks link between
-     *    the framebuffer and the actual video-memory: */
-    m_image = QImage(m_iWidth, m_iHeight, QImage::Format_RGB32);
-    m_image.fill(0);
-}
-

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

@@ -240 +240 @@
                               HiDPIOptimizationType hiDPIOptimizationType,
                               double dBackingScaleFactor);
-
-    /** Recreates own clean QImage buffer. */
-    void goFallback();
 
     /** Holds the QImage buffer. */