Added new command line parameter for WI port

Added support for WI on page switch during session

Author: Andrii Moroz

src/chrome/test/webdriver/webdriver_automation.cc

@@ -68,6 +68,7 @@
 #include "chrome/test/webdriver/frame_path.h"
 #include "chrome/test/webdriver/webdriver_basic_types.h"
 #include "chrome/test/webdriver/webdriver_error.h"
+#include "chrome/test/webdriver/webdriver_session_manager.h"
 // #include "chrome/test/webdriver/webdriver_util.h"
 
 // #if defined(OS_WIN)
@@ -237,6 +238,8 @@ void Automation::Init(const BrowserOptions& options, int* build_no, Error** erro
     qDebug() << "[WD]: geometry:" << pStartView->geometry();
     if (options.command.HasSwitch(switches::kStartMaximized))
         pStartView->showMaximized();
+ 
+    pStartView->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 
     pStartView->show();
 }
@@ -669,6 +672,8 @@ void Automation::NavigateToURL(const WebViewId &view_id, const std::string &url,
     view->load(address);
     if (isLoading)
         loop.exec();
+
+    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 }
 
 
@@ -684,6 +689,8 @@ void Automation::NavigateToURLAsync(const WebViewId &view_id, const std::string
 
     QUrl address(QString(url.c_str()));
     view->load(address);
+
+    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 }
 
 void Automation::GoForward(const WebViewId &view_id, Error **error)
@@ -698,6 +705,8 @@ void Automation::GoForward(const WebViewId &view_id, Error **error)
 
     QWebHistory *history = view->history();
     history->forward();
+
+    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 }
 
 void Automation::GoBack(const WebViewId &view_id, Error **error)
@@ -712,6 +721,8 @@ void Automation::GoBack(const WebViewId &view_id, Error **error)
 
     QWebHistory *history = view->history();
     history->back();
+
+    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 }
 
 void Automation::Reload(const WebViewId &view_id, Error **error)
@@ -725,6 +736,8 @@ void Automation::Reload(const WebViewId &view_id, Error **error)
     QWebView *view = qobject_cast<QWebView*>(view_id.GetView());
 
     view->reload();
+
+    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
 }
 
 void Automation::GetCookies(const WebViewId &view_id, const std::string &url, base::ListValue **cookies, Error **error)

src/chrome/test/webdriver/webdriver_server.cc

@@ -344,7 +344,8 @@ int RunChromeDriver() {
               << "                                  present"                                        << std::endl
               << "config                            The path to config file (e.g. config.json) in"  << std::endl
               << "                                  JSON format with specified WD parameters as"    << std::endl
-              << "                                  described above (port, root, etc.)"             << std::endl;
+              << "                                  described above (port, root, etc.)"             << std::endl
+              << "wi-port        9222               Web inspector listening port"                   << std::endl;
 
      return (EXIT_SUCCESS);
   }
@@ -409,7 +410,9 @@ int RunChromeDriver() {
   FilePath log_path;
   std::string root = "./web";
   std::string url_base;
+  int wi_port = 9222;
   int http_threads = 4;
+
   bool enable_keep_alive = false;
   if (cmd_line->HasSwitch("port"))
     port = cmd_line->GetSwitchValueASCII("port");
@@ -429,6 +432,9 @@ int RunChromeDriver() {
       return 1;
     }
   }
+  if (cmd_line->HasSwitch("wi-port"))
+      wi_port = QString(cmd_line->GetSwitchValueASCII("wi=port").c_str()).toInt();
+
 //  if (cmd_line->HasSwitch(kEnableKeepAlive))
 //    enable_keep_alive = true;
 
@@ -446,6 +452,7 @@ int RunChromeDriver() {
   SessionManager* manager = SessionManager::GetInstance();
   manager->set_port(port);
   manager->set_url_base(url_base);
+  manager->set_wi_port(wi_port);
 
   Dispatcher dispatcher(url_base);
   InitCallbacks(&dispatcher,  &shutdown_event, root.empty());
@@ -481,6 +488,7 @@ int RunChromeDriver() {
             << "root=" << root << std::endl
             << "url-base=" << url_base << std::endl
             << "http-threads=" << http_threads << std::endl
+            << "wi-port=" << wi_port << std::endl
             /*<< "version=" << chrome::kChromeVersion << std::endl*/;
   if (logging_success)
       std::cout << "log=" << FileLog::Get()->path().value() << std::endl;
@@ -529,6 +537,7 @@ bool parse_config_to_cmd_line()
             std::string url_base;
             int http_threads;
             std::string log_path;
+            int wi_port;
             if (result_dict->GetInteger("port", &port))
                 cmd_line->AppendSwitchASCII("port", base::IntToString(port));
             if (result_dict->GetString("root", &root))
@@ -539,6 +548,8 @@ bool parse_config_to_cmd_line()
                 cmd_line->AppendSwitchASCII("http-threads", base::IntToString(http_threads));
             if (result_dict->GetString("log-path", &log_path))
                 cmd_line->AppendSwitchASCII("log-path", log_path);
+            if (result_dict->GetInteger("wi-port", &wi_port))
+                cmd_line->AppendSwitchASCII("wi-port", base::IntToString(wi_port));
 
         }
         else

src/chrome/test/webdriver/webdriver_session_manager.cc

@@ -41,6 +41,11 @@ void SessionManager::set_port(const std::string& port) {
   port_ = port;
 }
 
+void SessionManager::set_wi_port(unsigned int port)
+{
+    wi_port_ = port;
+}
+
 void SessionManager::set_url_base(const std::string& url_base) {
   url_base_ = url_base;
 }
@@ -55,7 +60,11 @@ std::map<std::string, Session*> SessionManager::GetSessions()
     return map_;
 }
 
-SessionManager::SessionManager() : port_(""), url_base_("") {}
+SessionManager::SessionManager()
+    : port_(""),
+      url_base_(""),
+      wi_port_(9222)
+{}
 
 SessionManager::~SessionManager() {}
 
@@ -64,4 +73,9 @@ SessionManager* SessionManager::GetInstance() {
   return Singleton<SessionManager>::get();
 }
 
+unsigned int SessionManager::get_wi_port() const
+{
+    return wi_port_;
+}
+
 }  // namespace webdriver

src/chrome/test/webdriver/webdriver_session_manager.h

@@ -33,12 +33,15 @@ class SessionManager {
   Session* GetSession(const std::string& id) const;
 
   void set_port(const std::string& port);
+  void set_wi_port(unsigned int port);
 
   void set_url_base(const std::string& url_base);
   std::string url_base() const;
 
   std::map<std::string, Session*> GetSessions();
 
+  unsigned int get_wi_port() const;
+
  private:
   SessionManager();
   ~SessionManager();
@@ -48,6 +51,7 @@ class SessionManager {
   mutable base::Lock map_lock_;
   std::string port_;
   std::string url_base_;
+  unsigned int wi_port_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionManager);
 };

src/qwebviewext.cc

@@ -22,6 +22,8 @@ QWebViewExt::~QWebViewExt()
 QWebView* QWebViewExt::createWindow(QWebPage::WebWindowType type)
 {
     QWebViewExt* newView = new QWebViewExt;
+    newView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    newView->setProperty("_q_webInspectorServerPort", 9222);
     newView->show();
     newView->setAttribute(Qt::WA_DeleteOnClose, true);
     QVariant sessionId = property("sessionId");