Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1

Conflicts:
	src/compositor/compositor_api/qwaylandseat.cpp
	src/compositor/compositor_api/qwaylandview.cpp
	tests/auto/compositor/compositor.pro
	tests/auto/compositor/compositor/testinputdevice.cpp
	tests/auto/compositor/compositor/testinputdevice.h
	tests/auto/compositor/testinputdevice.cpp
	tests/auto/compositor/testinputdevice.h
	tests/auto/compositor/testseat.cpp
	tests/auto/compositor/testseat.h

Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a

1 files changed, 138 insertions, 0 deletions

diff --git a/tests/auto/client/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp
new file mode 100644
index 000000000..55712af11
--- /dev/null
+++ b/tests/auto/client/client/mocksurface.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mocksurface.h"
+#include "mockcompositor.h"
+
+namespace Impl {
+
+Surface::Surface(wl_client *client, uint32_t id, int v, Compositor *compositor)
+    : QtWaylandServer::wl_surface(client, id, v)
+    , m_buffer(Q_NULLPTR)
+    , m_compositor(compositor)
+    , m_mockSurface(new MockSurface(this))
+    , m_mapped(false)
+{
+}
+
+Surface::~Surface()
+{
+    m_mockSurface->m_surface = 0;
+}
+
+void Surface::map()
+{
+    m_mapped = true;
+}
+
+bool Surface::isMapped() const
+{
+    return m_mapped;
+}
+
+Surface *Surface::fromResource(struct ::wl_resource *resource)
+{
+    return static_cast<Surface *>(Resource::fromResource(resource)->surface_object);
+}
+
+void Surface::surface_destroy_resource(Resource *)
+{
+    compositor()->removeSurface(this);
+    delete this;
+}
+
+void Surface::surface_destroy(Resource *resource)
+{
+    wl_resource_destroy(resource->handle);
+}
+
+void Surface::surface_attach(Resource *resource,
+                             struct wl_resource *buffer, int x, int y)
+{
+    Q_UNUSED(resource);
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    m_buffer = buffer;
+
+    if (!buffer)
+        m_mockSurface->image = QImage();
+}
+
+void Surface::surface_damage(Resource *resource,
+                             int32_t x, int32_t y, int32_t width, int32_t height)
+{
+    Q_UNUSED(resource);
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    Q_UNUSED(width);
+    Q_UNUSED(height);
+}
+
+void Surface::surface_frame(Resource *resource,
+                            uint32_t callback)
+{
+    wl_resource *frameCallback = wl_resource_create(resource->client(), &wl_callback_interface, 1, callback);
+    m_frameCallbackList << frameCallback;
+}
+
+void Surface::surface_commit(Resource *resource)
+{
+    Q_UNUSED(resource);
+
+    if (m_buffer) {
+#if WAYLAND_VERSION_CHECK(1, 2, 0)
+        struct ::wl_shm_buffer *shm_buffer = wl_shm_buffer_get(m_buffer);
+#else
+        struct ::wl_buffer *shm_buffer = 0;
+        if (wl_buffer_is_shm(static_cast<struct ::wl_buffer*>(m_buffer->data)))
+            shm_buffer = static_cast<struct ::wl_buffer*>(m_buffer->data);
+#endif
+
+        if (shm_buffer) {
+            int stride = wl_shm_buffer_get_stride(shm_buffer);
+            uint format = wl_shm_buffer_get_format(shm_buffer);
+            Q_UNUSED(format);
+            void *data = wl_shm_buffer_get_data(shm_buffer);
+            const uchar *char_data = static_cast<const uchar *>(data);
+            QImage img(char_data, wl_shm_buffer_get_width(shm_buffer), wl_shm_buffer_get_height(shm_buffer), stride, QImage::Format_ARGB32_Premultiplied);
+            m_mockSurface->image = img;
+        }
+    }
+
+    foreach (wl_resource *frameCallback, m_frameCallbackList) {
+        wl_callback_send_done(frameCallback, m_compositor->time());
+        wl_resource_destroy(frameCallback);
+    }
+    m_frameCallbackList.clear();
+}
+
+}
+MockSurface::MockSurface(Impl::Surface *surface)
+    : m_surface(surface)
+{
+}