wsd/DocumentBroker.hpp | 6 ++++--
wsd/LOOLWSD.hpp | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 7a416cbf0a3cf6724d5ff21128ed46cb82c42a1a
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Sat Apr 18 16:44:50 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sat Apr 18 16:34:49 2020 +0200
Clarify what ChildProcess and WSProcess are
Change-Id: I13dd37c840d2c8b811bb56614fbc9f8ee2e44d40
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92475
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index d161be4aa..99391c0d0 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -58,8 +58,10 @@ public:
#include "LOOLWSD.hpp"
-/// Represents a new LOK child that is read
-/// to host a document.
+/// A ChildProcess object represents a KIT process that hosts a document and
manipulates the
+/// document using the LibreOfficeKit API. It isn't actually a child of the
WSD process, but a
+/// grandchild. The comments loosely talk about "child" anyway.
+
class ChildProcess : public WSProcess
{
public:
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 368b58076..c391cc055 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -38,10 +38,10 @@ std::shared_ptr<ChildProcess> getNewChild_Blocks(
const std::string& uri
#endif
);
-// This is common code used to setup as socket to both
-// forkit and child document processes via a websocket.
-// In general, a WSProcess instance represents a child
-// process with which we can communicate through websocket.
+// A WSProcess object in the WSD process represents a descendant process,
either the direct child
+// process FORKIT or a grandchild KIT process, with which the WSD process
communicates through a
+// WebSocket.
+
class WSProcess
{
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
