Moved VNC to extensions

Author: Andrii Moroz

src/vnc/vncclient.cc

@@ -8,6 +8,8 @@
 #define MAJOR_INDEX 6
 #define MINOR_INDEX 10
 
+VNCClient* VNCClient::_instance = NULL;
+
 static QMap<quint32, quint16> initializeMap()
 {
     QMap<quint32, quint16> resultMap;
@@ -71,6 +73,16 @@ VNCClient::~VNCClient()
     delete _serverParameters;
 }
 
+VNCClient* VNCClient::getInstance()
+{
+    if (NULL == _instance)
+    {
+        _instance = new VNCClient();
+    }
+
+    return _instance;
+}
+
 bool VNCClient::Init(QString remoteHost, quint16 port)
 {
     _socket = new QTcpSocket();

src/vnc/vncclient.h

@@ -12,9 +12,10 @@ class VNCClient : public QObject
     Q_OBJECT
 
 public:
-    VNCClient();
     ~VNCClient();
 
+    static VNCClient* getInstance();
+
     bool Init(QString remoteHost, quint16 port);
     void sendKeyEvent(QKeyEvent *key);
     void sendMouseEvent(QMouseEvent *mouse);
@@ -30,6 +31,8 @@ private slots:
     void onError(QAbstractSocket::SocketError error);
 
 private:
+    VNCClient();
+
     bool establishProtocolVersion(QByteArray& data);
     bool establishSecurity(QByteArray& data);
     bool finishHandshaking(QByteArray& data);
@@ -68,6 +71,7 @@ private slots:
     static QMap<quint32, quint16> _keymap;
 
 private:
+    static VNCClient *_instance;
     QTcpSocket *_socket;
     bool _versionEstablished;
     bool _securityEstablished;

src/webdriver/extension_qt/q_session_lifecycle_actions.cc

@@ -1,4 +1,8 @@
 #include "extension_qt/q_session_lifecycle_actions.h"
+#include "extension_qt/wd_event_dispatcher.h"
+#include "extension_qt/vnc_event_dispatcher.h"
+#include "webdriver_switches.h"
+#include "webdriver_server.h"
 
 #include "q_proxy_parser.h"
 
@@ -29,6 +33,25 @@ Error* QSessionLifeCycleActions::PostInit(const base::DictionaryValue* desired_c
 		session_->logger().Log(kInfoLogLevel, "no proxy settings requsted.");
 	}
 
+    // start VNC module
+    CommandLine cmdLine = webdriver::Server::GetInstance()->GetCommandLine();
+    if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer) || cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
+    {
+        QString address = "127.0.0.1";
+        int port = 5900;
+
+        if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer))
+            address = cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCServer).c_str();
+        if (cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
+            port = QString(cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCPort).c_str()).toInt();
+
+        VNCClient *client = VNCClient::getInstance();
+        if (!client->isReady())
+            client->Init(address, port);
+
+        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+    }
+
 	return error;
 }
 

src/webdriver/webdriver_server.cc

@@ -4,9 +4,6 @@
 #include "webdriver_route_table.h"
 #include "commands/command.h"
 #include "commands/response.h"
-#include "vnc/vncclient.h"
-#include "extension_qt/wd_event_dispatcher.h"
-#include "extension_qt/vnc_event_dispatcher.h"
 
 #include "mongoose.h"
 
@@ -141,25 +138,6 @@ int Server::Start() {
     }
     opts[mg_options_.size()] = NULL;
 
-    // start VNC module
-    CommandLine cmdLine = webdriver::Server::GetInstance()->GetCommandLine();
-    if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer) || cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
-    {
-        QString address = "127.0.0.1";
-        int port = 5900;
-
-        if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer))
-            address = cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCServer).c_str();
-        if (cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
-            port = QString(cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCPort).c_str()).toInt();
-
-        VNCClient *client = new VNCClient();
-        client->Init(address, port);
-
-
-        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
-    }
-
     // Initialize SHTTPD context.
     mg_ctx_ = mg_start((mg_callback_t)&ProcessHttpRequestCb,
                         this,