Changeset 49535 in vbox for trunk

Timestamp:

Nov 18, 2013 3:41:20 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90713

Message:

vhwa: cleanup fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (1 diff)
• VBoxFBOverlay.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2595 +2595 @@
     else
     {
+        Assert(pList);
         Assert(pList->size() >= 1);
         if(pList->size() > 1)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1016 +1016 @@
 
     VBoxVHWASurfList() : mCurrent(NULL) {}
+
+    void moveTo(VBoxVHWASurfList *pDst)
+    {
+        for (SurfList::iterator it = mSurfaces.begin();
+             it != mSurfaces.end(); it = mSurfaces.begin())
+        {
+            pDst->add((*it));
+        }
+
+        Assert(empty());
+    }
+
     void add(VBoxVHWASurfaceBase *pSurf)
     {
@@ -1026 +1038 @@
         pSurf->setComplexList(this);
     }
-
+/*
     void clear()
     {
@@ -1037 +1049 @@
         mCurrent = NULL;
     }
-
+*/
     size_t size() const {return mSurfaces.size(); }
 
@@ -1078 +1090 @@
         VBoxVHWASurfaceBase * old = mSurfVGA;
         mSurfVGA = pVga;
-        mPrimary.clear();
+        if (!mPrimary.empty())
+        {
+            VBoxVHWASurfList *pNewList = new VBoxVHWASurfList();
+            mPrimary.moveTo(pNewList);
+            Assert(mPrimary.empty());
+        }
         if(pVga)
         {