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

Author: nataliakoval

Doxyfile

@@ -186,7 +186,7 @@ HTML_HEADER            =
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
 HTML_EXTRA_STYLESHEET  = 
-HTML_EXTRA_FILES       = 
+HTML_EXTRA_FILES       = ./src/webdriver/whitelist.xsd
 HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80

build.sh

@@ -27,8 +27,8 @@ else
   modes=$mode
 fi
 
-OUT_STATIC_LIB_FILES="libchromium_base.a libWebDriver_core.a libWebDriver_extension_qt_base.a libWebDriver_extension_qt_web.a libWebDriver_extension_qt_quick.a"
-OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_noWebkit_android.so"
+OUT_STATIC_LIB_FILES="libchromium_base.a libWebDriver_core.a libWebDriver_extension_qt_base.a libWebDriver_extension_qt_web.a libWebDriver_extension_qt_quick.a libWebDriver_extension_qt_quick_web.a"
+OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_extension_qt_quick_web.so libWebDriver_noWebkit_android.so"
 OUT_BIN_FILES="WebDriver WebDriver_noWebkit WebDriver_noWebkit_sharedLibs"
 GYP=`which gyp`
 

inc/commands/browser_connection_command.h

@@ -1,3 +1,7 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef BROWSER_CONNECTION_COMMAND_H
 #define BROWSER_CONNECTION_COMMAND_H
 

inc/commands/element_commands.h

@@ -257,6 +257,19 @@ class ElementTextCommand : public ElementCommand {
     DISALLOW_COPY_AND_ASSIGN(ElementTextCommand);
 };
 
+class ElementScreenshotCommand : public ElementCommand {
+public:
+    ElementScreenshotCommand(const std::vector<std::string>& path_segments,
+                          const base::DictionaryValue* parameters);
+    virtual ~ElementScreenshotCommand();
+
+    virtual bool DoesGet() const OVERRIDE;
+    virtual void ExecuteGet(Response* const response) OVERRIDE;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(ElementScreenshotCommand);
+};
+
 }  // namespace webdriver
 
 #endif  // WEBDRIVER_COMMANDS_WEBELEMENT_COMMANDS_H_

inc/commands/html5_location_commands.h

@@ -1,3 +1,7 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef WEBDRIVER_COMMANDS_HTML5_LOCATION_COMMANDS_H_
 #define WEBDRIVER_COMMANDS_HTML5_LOCATION_COMMANDS_H_
 

inc/commands/orientation_command.h

@@ -1,3 +1,7 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef ORIENTATION_COMMAND_H
 #define ORIENTATION_COMMAND_H
 

inc/commands/touch_commands.h

@@ -139,6 +139,32 @@ class TouchFlickCommand : public TouchCommand {
     DISALLOW_COPY_AND_ASSIGN(TouchFlickCommand);
 };
 
+/// Rotate element using pinch rotate fingers motion events.
+class TouchPinchRotateCommand : public TouchCommand {
+public:
+    TouchPinchRotateCommand(const std::vector<std::string>& path_segments,
+           const base::DictionaryValue* const parameters);
+    virtual ~TouchPinchRotateCommand();
+
+    virtual void ExecutePost(Response* const response) OVERRIDE;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(TouchPinchRotateCommand);
+};
+
+/// Rotate element using pinch zoom fingers motion events.
+class TouchPinchZoomCommand : public TouchCommand {
+public:
+    TouchPinchZoomCommand(const std::vector<std::string>& path_segments,
+           const base::DictionaryValue* const parameters);
+    virtual ~TouchPinchZoomCommand();
+
+    virtual void ExecutePost(Response* const response) OVERRIDE;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(TouchPinchZoomCommand);
+};
+
 }  // namespace webdriver
 
 #endif // TOUCH_COMMANDS_H

inc/extension_qt/graphics_web_view_executor.h

@@ -47,6 +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 GoForward(Error** error);
     virtual void GoBack(Error** error);
     virtual void Reload(Error** error);
@@ -131,6 +132,8 @@ class GraphicsWebViewCmdExecutor : public ViewCmdExecutor {
     virtual void GetOrientation(std::string *orientation, Error **error);
     virtual void SetOnline(bool, Error** error);
     virtual void IsOnline(bool*, Error** error);
+    virtual void TouchPinchZoom(const ElementId &element, const double &scale, Error **error) NOT_SUPPORTED_IMPL;
+    virtual void TouchPinchRotate(const ElementId &element, const int &angle, Error **error) NOT_SUPPORTED_IMPL;
 
 protected:
     QGraphicsWebView* getView(const ViewId& viewId, Error** error);

inc/extension_qt/qml_view_executor.h

@@ -38,6 +38,7 @@ class QQmlViewCmdExecutor : public QViewCmdExecutor {
     virtual void Reload(Error** error) NOT_SUPPORTED_IMPL;
     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);
     virtual void MouseDoubleClick(Error** error);
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
@@ -103,21 +104,20 @@ class QQmlViewCmdExecutor : public QViewCmdExecutor {
     virtual void GetMute(const ElementId& element, bool*, Error**error) NOT_SUPPORTED_IMPL;
     virtual void SetPlaybackSpeed(const ElementId& element, double, Error**error) NOT_SUPPORTED_IMPL;;
     virtual void GetPlaybackSpeed(const ElementId& element, double*, Error**error) NOT_SUPPORTED_IMPL;;
-    virtual void VisualizerSource(std::string* source, Error** error) NOT_SUPPORTED_IMPL;
+    virtual void VisualizerSource(std::string* source, Error** error);
     virtual void VisualizerShowPoint(Error** error) NOT_SUPPORTED_IMPL;
+    virtual void TouchPinchZoom(const ElementId &element, const double &scale, Error** error) NOT_SUPPORTED_IMPL;
+    virtual void TouchPinchRotate(const ElementId &element, const int &angle, Error** error) NOT_SUPPORTED_IMPL;
 
     virtual void SetOnline(bool, Error** error) NOT_SUPPORTED_IMPL;
     virtual void IsOnline(bool*, Error** error) NOT_SUPPORTED_IMPL;
 
 protected:
     QDeclarativeView* getView(const ViewId& viewId, Error** error);
-    typedef QHash<QString, QDeclarativeItem*> XMLElementMap;    
 
     QDeclarativeItem* getElement(const ElementId &element, Error** error);
     bool FilterElement(const QDeclarativeItem* item, const std::string& locator, const std::string& query);
     void FindElementsByXpath(QDeclarativeItem* parent, const std::string &query, std::vector<ElementId>* elements, Error **error);
-    void createUIXML(QDeclarativeItem *parent, QIODevice* buff, XMLElementMap& elementsMap, Error** error);
-    void addItemToXML(QDeclarativeItem* parent, XMLElementMap& elementsMap, QXmlStreamWriter* writer);
 
 private:
     DISALLOW_COPY_AND_ASSIGN(QQmlViewCmdExecutor);

inc/extension_qt/qml_web_view_executor.h

@@ -48,6 +48,7 @@ class QmlWebViewCmdExecutor : 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 GoForward(Error** error);
     virtual void GoBack(Error** error);
     virtual void Reload(Error** error);
@@ -132,6 +133,8 @@ class QmlWebViewCmdExecutor : public ViewCmdExecutor {
     virtual void GetOrientation(std::string *orientation, Error **error);
     virtual void SetOnline(bool, Error** error);
     virtual void IsOnline(bool*, Error** error);
+    virtual void TouchPinchZoom(const ElementId &element, const double &scale, Error** error) NOT_SUPPORTED_IMPL;
+    virtual void TouchPinchRotate(const ElementId &element, const int &angle, Error** error) NOT_SUPPORTED_IMPL;
 
 protected:
     QDeclarativeWebView* getView(const ViewId& viewId, Error** error);