Changeset 53153 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Oct 27, 2014 2:52:20 PM (10 years ago)

Author:

vboxsync

Message:

Host 3D: Chromium server: Presentation framework: drop unused code.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Files:

• display_vrdp.cpp (modified) (1 diff)
• display_window.cpp (modified) (3 diffs)
• display_window_rootvr.cpp (modified) (2 diffs)
• server_presenter.cpp (modified) (2 diffs)
• server_presenter.h (modified) (4 diffs)

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

@@ -2 +2 @@
 
 /** @file
- * Presenter API: display window root class implementation.
+ * Presenter API: CrFbDisplayVrdp class implementation -- display content over VRDP.
  */
 

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

@@ -2 +2 @@
 
 /** @file
- * Presenter API: display window class implementation.
+ * Presenter API: CrFbDisplayWindow class implementation -- display content into host GUI window.
  */
 
@@ -19 +19 @@
 #include "server_presenter.h"
 
-CrFbDisplayWindow::CrFbDisplayWindow(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId) :
+CrFbDisplayWindow::CrFbDisplayWindow(const RTRECT *pViewportRect, uint64_t parentId) :
     mpWindow(NULL),
     mViewportRect(*pViewportRect),
     mu32Screen(~0),
-    mParentId(parentId),
-    mDefaultParentId(defaultParentId)
+    mParentId(parentId)
 {
     mFlags.u32Value = 0;
@@ -242 +241 @@
 
     return mpWindow;
-}
-
-
-int CrFbDisplayWindow::setDefaultParent(uint64_t parentId)
-{
-    mDefaultParentId = parentId;
-
-    if (!isActive() && mpWindow)
-    {
-        int rc = mpWindow->Reparent(parentId);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("window reparent failed"));
-            return rc;
-        }
-    }
-
-    return VINF_SUCCESS;
 }
 

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

@@ -2 +2 @@
 
 /** @file
- * Presenter API: display window root class implementation.
+ * Presenter API: CrFbDisplayWindowRootVr class implementation -- display seamless content.
  */
 
@@ -20 +20 @@
 
 
-CrFbDisplayWindowRootVr::CrFbDisplayWindowRootVr(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId) :
-    CrFbDisplayWindow(pViewportRect, parentId, defaultParentId)
+CrFbDisplayWindowRootVr::CrFbDisplayWindowRootVr(const RTRECT *pViewportRect, uint64_t parentId) :
+    CrFbDisplayWindow(pViewportRect, parentId)
 {
     CrVrScrCompositorInit(&mCompositor, NULL);

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

@@ -2155 +2155 @@
         }
 
-        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, /*cr_server.screen[0].winID*/ 0);
+        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID);
         pDpInfo->pDpWin = pDpInfo->pDpWinRootVr;
         pDpInfo->pDpWinRootVr->windowAttach(pDpInfo->pWindow);
@@ -2179 +2179 @@
             pDpInfo->pWindow = new CrFbWindow(0);
 
-        pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, /*cr_server.screen[0].winID*/ 0);
+        pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID);
         pDpInfo->pDpWin->windowAttach(pDpInfo->pWindow);
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.h

@@ -257 +257 @@
     public:
 
-        CrFbDisplayWindow(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId);
+        CrFbDisplayWindow(const RTRECT *pViewportRect, uint64_t parentId);
         virtual ~CrFbDisplayWindow();
         virtual int UpdateBegin(struct CR_FRAMEBUFFER *pFb);
@@ -270 +270 @@
         virtual CrFbWindow * windowDetach(bool fCleanup = true);
         virtual CrFbWindow * windowAttach(CrFbWindow * pNewWindow);
-        virtual int setDefaultParent(uint64_t parentId);
         virtual int reparent(uint64_t parentId);
         virtual bool isVisible();
@@ -307 +306 @@
         uint32_t mu32Screen;
         uint64_t mParentId;
-        uint64_t mDefaultParentId;
 };
 
@@ -315 +313 @@
     public:
 
-        CrFbDisplayWindowRootVr(const RTRECT *pViewportRect, uint64_t parentId, uint64_t defaultParentId);
+        CrFbDisplayWindowRootVr(const RTRECT *pViewportRect, uint64_t parentId);
         virtual int EntryCreated(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry);
         virtual int EntryAdded(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry);