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

Author: AndriyP

build_android.sh

@@ -144,6 +144,7 @@ fi
     fi
 
     cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD.apk
+    rm -rf $dist_dir/android
 
   done
 

inc/extension_qt/q_view_executor.h

@@ -52,6 +52,8 @@ class QViewCmdExecutor : public ViewCmdExecutor {
     QTouchEvent::TouchPoint createTouchPoint(Qt::TouchPointState state, QPointF &point);
     QTouchEvent* createSimpleTouchEvent(QEvent::Type eventType, Qt::TouchPointStates touchPointStates, QPointF point);
     QTouchEvent* createTouchEvent(QEvent::Type eventType, Qt::TouchPointStates touchPointStates, const QList<QTouchEvent::TouchPoint> &touchPoints);
+    QTouchEvent* create2PointTouchEvent(QEvent::Type eventType, Qt::TouchPointStates touchPointStates, QPointF &point1, QPointF &point2);
+    QTouchEvent::TouchPoint createTouchPointWithId(Qt::TouchPointState state, QPointF &point, int id);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
   QTouchDevice touchDevice;
 #endif

inc/extension_qt/web_view_executor.h

@@ -126,8 +126,8 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
     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;
+    virtual void TouchPinchZoom(const ElementId &element, const double &scale, Error** error);
+    virtual void TouchPinchRotate(const ElementId &element, const int &angle, Error** error);
 
 protected:
 	QWebView* getView(const ViewId& viewId, Error** error);

src/third_party/tidy-html5/include/buffio.h

@@ -0,0 +1,112 @@
+#ifndef __TIDY_BUFFIO_H__
+#define __TIDY_BUFFIO_H__
+
+/** @file buffio.h - Treat buffer as an I/O stream.
+
+  (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
+  See tidy.h for the copyright notice.
+
+  Requires buffer to automatically grow as bytes are added.
+  Must keep track of current read and write points.
+
+*/
+
+#include "platform.h"
+#include "tidy.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** TidyBuffer - A chunk of memory */
+TIDY_STRUCT
+struct _TidyBuffer 
+{
+    TidyAllocator* allocator;  /**< Memory allocator */
+    byte* bp;           /**< Pointer to bytes */
+    uint  size;         /**< # bytes currently in use */
+    uint  allocated;    /**< # bytes allocated */ 
+    uint  next;         /**< Offset of current input position */
+};
+
+/** Initialize data structure using the default allocator */
+TIDY_EXPORT void TIDY_CALL tidyBufInit( TidyBuffer* buf );
+
+/** Initialize data structure using the given custom allocator */
+TIDY_EXPORT void TIDY_CALL tidyBufInitWithAllocator( TidyBuffer* buf, TidyAllocator* allocator );
+
+/** Free current buffer, allocate given amount, reset input pointer,
+    use the default allocator */
+TIDY_EXPORT void TIDY_CALL tidyBufAlloc( TidyBuffer* buf, uint allocSize );
+
+/** Free current buffer, allocate given amount, reset input pointer,
+    use the given custom allocator */
+TIDY_EXPORT void TIDY_CALL tidyBufAllocWithAllocator( TidyBuffer* buf,
+                                                      TidyAllocator* allocator,
+                                                      uint allocSize );
+
+/** Expand buffer to given size. 
+**  Chunk size is minimum growth. Pass 0 for default of 256 bytes.
+*/
+TIDY_EXPORT void TIDY_CALL tidyBufCheckAlloc( TidyBuffer* buf,
+                                              uint allocSize, uint chunkSize );
+
+/** Free current contents and zero out */
+TIDY_EXPORT void TIDY_CALL tidyBufFree( TidyBuffer* buf );
+
+/** Set buffer bytes to 0 */
+TIDY_EXPORT void TIDY_CALL tidyBufClear( TidyBuffer* buf );
+
+/** Attach to existing buffer */
+TIDY_EXPORT void TIDY_CALL tidyBufAttach( TidyBuffer* buf, byte* bp, uint size );
+
+/** Detach from buffer.  Caller must free. */
+TIDY_EXPORT void TIDY_CALL tidyBufDetach( TidyBuffer* buf );
+
+
+/** Append bytes to buffer.  Expand if necessary. */
+TIDY_EXPORT void TIDY_CALL tidyBufAppend( TidyBuffer* buf, void* vp, uint size );
+
+/** Append one byte to buffer.  Expand if necessary. */
+TIDY_EXPORT void TIDY_CALL tidyBufPutByte( TidyBuffer* buf, byte bv );
+
+/** Get byte from end of buffer */
+TIDY_EXPORT int TIDY_CALL  tidyBufPopByte( TidyBuffer* buf );
+
+
+/** Get byte from front of buffer.  Increment input offset. */
+TIDY_EXPORT int TIDY_CALL  tidyBufGetByte( TidyBuffer* buf );
+
+/** At end of buffer? */
+TIDY_EXPORT Bool TIDY_CALL tidyBufEndOfInput( TidyBuffer* buf );
+
+/** Put a byte back into the buffer.  Decrement input offset. */
+TIDY_EXPORT void TIDY_CALL tidyBufUngetByte( TidyBuffer* buf, byte bv );
+
+
+/**************
+   TIDY
+**************/
+
+/* Forward declarations
+*/
+
+/** Initialize a buffer input source */
+TIDY_EXPORT void TIDY_CALL tidyInitInputBuffer( TidyInputSource* inp, TidyBuffer* buf );
+
+/** Initialize a buffer output sink */
+TIDY_EXPORT void TIDY_CALL tidyInitOutputBuffer( TidyOutputSink* outp, TidyBuffer* buf );
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __TIDY_BUFFIO_H__ */
+
+/*
+ * local variables:
+ * mode: c
+ * indent-tabs-mode: nil
+ * c-basic-offset: 4
+ * eval: (c-set-offset 'substatement-open 0)
+ * end:
+ */