Changeset 53157 in vbox

Timestamp:

Oct 27, 2014 5:24:02 PM (10 years ago)

Author:

vboxsync

Message:

Host 3D: Chronium server: Presentation framework: fixed resources leak (needs more testing on hosts other than X11).

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/presenter/display_window.cpp (modified) (8 diffs)
• crserverlib/presenter/window.cpp (modified) (5 diffs)
• render/renderspu_init.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp

@@ -25 +25 @@
     mParentId(parentId)
 {
+    crDebug("CrFbDisplayWindow: created with parentID %p.", parentId);
     mFlags.u32Value = 0;
 }
@@ -78 +79 @@
     if (mpWindow && mpWindow->GetParentId())
     {
-        rc = mpWindow->Create();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
+        if (!mpWindow->IsCreated())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
         }
     }
@@ -101 +105 @@
     if (mpWindow && mpWindow->GetParentId())
     {
-        rc = mpWindow->Create();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
+        if (!mpWindow->IsCreated())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
         }
     }
@@ -124 +131 @@
     if (mpWindow && mpWindow->GetParentId())
     {
-        rc = mpWindow->Create();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
+        if (!mpWindow->IsCreated())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
         }
     }
@@ -147 +157 @@
     if (mpWindow && mpWindow->GetParentId())
     {
-        rc = mpWindow->Create();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
+        if (!mpWindow->IsCreated())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+            return rc;
+            }
         }
     }
@@ -251 +264 @@
         return VERR_INVALID_STATE;
     }
+
+    crDebug("CrFbDisplayWindow: change parent from %p to %p.", mParentId, parentId);
 
     mParentId = parentId;
@@ -424 +439 @@
     int rc = VINF_SUCCESS;
 
+    crDebug("CrFbDisplayWindow: sync window dimentions: fForceCleanup=%s, mpWindow=%p, isActive()=%s",
+        fForceCleanup ? "yes" : "no",
+        mpWindow,
+        isActive() ? "yes" : "no");
+
     if (!mpWindow)
         return VINF_SUCCESS;
@@ -545 +565 @@
         if (mpWindow && mpWindow->GetParentId())
         {
+            if (mpWindow->IsCreated())
+                mpWindow->Destroy();
+
             rc = mpWindow->Create();
             if (!RT_SUCCESS(rc))

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/window.cpp

@@ -61 +61 @@
 int CrFbWindow::Reparent(uint64_t parentId)
 {
+    crDebug("CrFbWindow: reparent to %p (current mxPos=%d, myPos=%d, mWidth=%u, mHeight=%u)",
+        parentId, mxPos, myPos, mWidth, mHeight);
+
     if (!checkInitedUpdating())
     {
@@ -78 +81 @@
         renderspuSetWindowId(mParentId);
         renderspuReparentWindow(mSpuWindow);
-        renderspuSetWindowId(cr_server.screen[0].winID);
 
         if (parentId)
@@ -100 +102 @@
     }
 
-    LOG(("CrWIN: Vidible [%d]", fVisible));
+    LOG(("CrWIN: Visible [%d]", fVisible));
 
     if (!fVisible != !mFlags.fVisible)
@@ -265 +267 @@
     if (mSpuWindow)
     {
-        //WARN(("window already created"));
+        WARN(("window already created"));
         return VINF_ALREADY_INITIALIZED;
     }
@@ -286 +288 @@
         cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, true);
 
+    crDebug("CrFbWindow: create window with parent %p (mxPos=%d, myPos=%d, mWidth=%u, mHeight=%u)",
+        mParentId, mxPos, myPos, mWidth, mHeight);
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -619 +619 @@
 {
     render_spu_parent_window_id = winId;
-}
+    crDebug("X11: set new parent window %p (no actual reparent performed)", winId);
+}