Changeset 49128 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 16, 2013 11:35:35 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: MacOS X: Quartz2D frame-buffer: Removing some stuff added in r69057 and incorrectly reverted in r69130.

Location:

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

Files:

• UIFrameBufferQuartz2D.cpp (modified) (4 diffs)
• UIFrameBufferQuartz2D.h (modified) (2 diffs)

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

@@ -50 +50 @@
 UIFrameBufferQuartz2D::UIFrameBufferQuartz2D(UIMachineView *pMachineView)
     : UIFrameBuffer(pMachineView)
-    , m_pMachineLogic(pMachineView->machineLogic())
     , m_fUsesGuestVRAM(false)
     , m_pDataAddress(NULL)
@@ -251 +250 @@
 
     /* We handle the seamless mode as a special case. */
-    if (m_pMachineLogic->visualStateType() == UIVisualStateType_Seamless)
+    if (m_pMachineView->machineLogic()->visualStateType() == UIVisualStateType_Seamless)
     {
         /* Determine current visible region: */
@@ -346 +345 @@
         }
     }
-    else if (   m_pMachineLogic->visualStateType() == UIVisualStateType_Scale
+    else if (   m_pMachineView->machineLogic()->visualStateType() == UIVisualStateType_Scale
              && m_scaledSize.isValid())
     {
@@ -498 +497 @@
 }
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
-void UIFrameBufferQuartz2D::setView(UIMachineView *pView)
-{
-    if (pView)
-        m_pMachineLogic = pView->machineLogic();
-
-    UIFrameBuffer::setView(pView);
-}
-#endif
-
 #endif /* VBOX_GUI_USE_QUARTZ2D */
 

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

@@ -51 +51 @@
     void paintEvent(QPaintEvent *pEvent);
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void setView(UIMachineView *pView);
-#endif
-
 private:
 
     void clean(bool fPreserveRegions);
 
-    UIMachineLogic *m_pMachineLogic;
     bool m_fUsesGuestVRAM;
     uchar *m_pDataAddress;
@@ -88 +83 @@
      * This is operated with atomic cmpxchg and atomic xchg. */
     RegionRects * volatile mRegionUnused;
-
 };