Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: nataliakoval

generate_wdversion.py

@@ -8,7 +8,7 @@
 versionfile = open (filename, 'w')
 versionfile.write("namespace webdriver {\n")
 versionfile.write("extern const char kProductName[] = \"WebDriver-cisco-cmt\";\n")
-versionfile.write("extern const char kVersionNumber[] = \"1.3.0\";\n")
+versionfile.write("extern const char kVersionNumber[] = \"1.2.1\";\n")
 versionfile.write("extern const char kBuildTime[] = __TIME__;\n")
 versionfile.write("extern const char kBuildDate[] = __DATE__;\n")
 versionfile.write("extern const char kLastChanges[] = \"" + data.strip() + "\";\n")

inc/extension_qt/graphics_web_view_executor.h

@@ -47,7 +47,7 @@ class GraphicsWebViewCmdExecutor : public ViewCmdExecutor {
     virtual void SetBounds(const Rect& bounds, Error** error) NOT_SUPPORTED_IMPL;
     virtual void Maximize(Error** error) NOT_SUPPORTED_IMPL;
     virtual void GetScreenShot(std::string* png, Error** error);
-    virtual void GetElementScreenShot(const ElementId& element, std::string* png, Error** error) NOT_SUPPORTED_IMPL;
+    virtual void GetElementScreenShot(const ElementId& element, std::string* png, Error** error);
     virtual void GoForward(Error** error);
     virtual void GoBack(Error** error);
     virtual void Reload(Error** error);
@@ -137,6 +137,7 @@ class GraphicsWebViewCmdExecutor : public ViewCmdExecutor {
 
 protected:
     QGraphicsWebView* getView(const ViewId& viewId, Error** error);
+    void saveScreenshot(QImage& image, std::string* png, Error** error);
 
 private:
     scoped_ptr<QWebkitProxy> webkitProxy_;

inc/extension_qt/q_view_executor.h

@@ -58,6 +58,8 @@ class QViewCmdExecutor : public ViewCmdExecutor {
   QTouchDevice touchDevice;
 #endif
 
+    void saveScreenshot(QPixmap& pixmap, std::string* png, Error** error);
+
 private:
     DISALLOW_COPY_AND_ASSIGN(QViewCmdExecutor);
 };

inc/extension_qt/web_view_executor.h

@@ -1,6 +1,7 @@
 #ifndef WEBDRIVER_QT_WEB_VIEW_EXECUTOR_H_
 #define WEBDRIVER_QT_WEB_VIEW_EXECUTOR_H_
 
+#include "base/yasper.h"
 #include "extension_qt/q_view_executor.h"
 #include "webdriver_logging.h"
 
@@ -50,7 +51,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
     virtual void Reload(Error** error);
     virtual void GetSource(std::string* source, Error** error);
     virtual void SendKeys(const ElementId& element, const string16& keys, Error** error);
-    virtual void GetElementScreenShot(const ElementId& element, std::string* png, Error** error) NOT_SUPPORTED_IMPL;
+    virtual void GetElementScreenShot(const ElementId& element, std::string* png, Error** error);
     virtual void MouseDoubleClick(Error** error);
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
@@ -133,7 +134,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 	QWebView* getView(const ViewId& viewId, Error** error);
 
 private:
-    scoped_ptr<QWebkitProxy> webkitProxy_;
+    yasper::ptr<QWebkitProxy> webkitProxy_;
     QWebView* view_;
 
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutor);

inc/webdriver_server.h

@@ -183,6 +183,8 @@ class Server {
 
     int ParseConfigToOptions();
 
+    int ParseMongooseConfig();
+
     DISALLOW_COPY_AND_ASSIGN(Server);
 };
 

inc/webdriver_switches.h

@@ -88,6 +88,16 @@ class Switches {
 
     static const char kWhiteList[];
 
+    /// \page page_webdriver_switches WD Server switches
+    /// - <b>webserver-cfg</b><br>
+    /// The path to mongoose config file (e.g. config.json) in
+    /// JSON format with specified mongoose start option
+    /// (extra-mime-types, listening_ports, etc.)
+    /// Option from webserver config file will have more priority than
+    /// commandline param that specify the same option.
+
+    static const char kWebServerCfg[];
+
 };
 
 }  // namespace webdriver