QtMir

CMakeLists.txt (+1/-0)
debian/control (+1/-0)
src/modules/Unity/Application/dbusfocusinfo.cpp (+11/-2)
src/platforms/mirserver/CMakeLists.txt (+5/-0)
src/platforms/mirserver/clipboard.cpp (+91/-241)
src/platforms/mirserver/clipboard.h (+36/-53)
src/platforms/mirserver/mirserverintegration.cpp (+5/-4)
src/platforms/mirserver/mirserverintegration.h (+0/-5)
src/platforms/mirserver/shelluuid.cpp (+35/-0)
src/platforms/mirserver/shelluuid.h (+33/-0)
tests/mirserver/CMakeLists.txt (+0/-1)
tests/mirserver/Clipboard/CMakeLists.txt (+0/-27)
tests/mirserver/Clipboard/clipboard_test.cpp (+0/-75)

To merge this branch:

bzr merge lp:~dandrader/qtmir/content-hub-clipboard

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Terry (community)	testing		Approve on 2016-08-29
Unity8 CI Bot (community)	continuous-integration	2016-08-24	Needs Fixing on 2016-08-26
Gerry Boland	code	2016-08-24	Pending
Review via email: mp+303863@code.launchpad.net

This proposal supersedes a proposal from 2016-08-01.

Commit message

Use content-hub for clipboard services

And remove our own implementation of such service

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
It's all in silo 037 (https://requests.ci-train.ubuntu.com/#/ticket/1500)

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

To test copy-and-paste from inside unity8 add this snippet to Shell.qml:
http://pastebin.ubuntu.com/23107367/

That will give you a a text field on the bottom right of shell UI.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:530
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dandrader/qtmir/content-hub-clipboard/+merge/301705/+edit-commit-message

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/317/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-08-03: Posted in a previous version of this proposal

=== modified file 'src/platforms/mirserver/clipboard.h'
+ * Copyright (C) 2014,2016 Canonical, Ltd.
2014-2016

+ QMimeData *mMimeData;
Using a QScopedPointer here would mean you don't have to worry about deleting the contents before you change it.

Similar for mPasteReply, that I don't see ever being deleted here - leak?

=== modified file 'src/platforms/mirserver/clipboard.cpp'
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
one of those times "auto" is nicer, since you state the type twice.

Everything else quite sensible. I need to test the silo though

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-03: Posted in a previous version of this proposal

On 03/08/2016 13:30, Gerry Boland wrote:
> Review: Needs Fixing
>
> === modified file 'src/platforms/mirserver/clipboard.h'
> + * Copyright (C) 2014,2016 Canonical, Ltd.
> 2014-2016

Done.

> + QMimeData *mMimeData;
> Using a QScopedPointer here would mean you don't have to worry about deleting the contents before you change it.

Done.

> Similar for mPasteReply, that I don't see ever being deleted here - leak?

Yes, leak. Fixed. Thanks!

> === modified file 'src/platforms/mirserver/clipboard.cpp'
> + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
> one of those times "auto" is nicer, since you state the type twice.
>

Right. Done.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/320/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/321/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-08-08: Posted in a previous version of this proposal

+Clipboard::Clipboard()
+{
+ mMimeData.reset(new QMimeData);
This is nicer:
+Clipboard::Clipboard()
+ : mMimeData(new QMimeData);

+void Clipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
+ QDBusPendingCall reply = mContentHub->createPaste(*mimeData);
+
+ // Don't care whether it succeeded
+ auto *watcher = new QDBusPendingCallWatcher(reply, this);
+ connect(watcher, &QDBusPendingCallWatcher::finished,
+ watcher, &QObject::deleteLater);
if you don't care, why do you do this at all? I would think just calling createPaste and throwing away the returned QDBusPendingCall is enough.

Rest looks good though

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-08: Posted in a previous version of this proposal

> +void Clipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
> + QDBusPendingCall reply = mContentHub->createPaste(*mimeData);
> +
> + // Don't care whether it succeeded
> + auto *watcher = new QDBusPendingCallWatcher(reply, this);
> + connect(watcher, &QDBusPendingCallWatcher::finished,
> + watcher, &QObject::deleteLater);
> if you don't care, why do you do this at all? I would think just calling
> createPaste and throwing away the returned QDBusPendingCall is enough.

I also thought that when I first wrote it. But the destructor of a QDBusPendingCall cancels the call if it's still ongoing and we don't want that. Thus we have to keep a QDBusPendingCall instance around (such as a QDBusPendingCallWatcher) until the remote method call is done.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-08: Posted in a previous version of this proposal

> +Clipboard::Clipboard()
> +{
> + mMimeData.reset(new QMimeData);
> This is nicer:
> +Clipboard::Clipboard()
> + : mMimeData(new QMimeData);

Done.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:535
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/324/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2492/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2520/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/324/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-08-08: Posted in a previous version of this proposal

> > if you don't care, why do you do this at all? I would think just calling
> > createPaste and throwing away the returned QDBusPendingCall is enough.
>
> I also thought that when I first wrote it. But the destructor of a
> QDBusPendingCall cancels the call if it's still ongoing and we don't want
> that. Thus we have to keep a QDBusPendingCall instance around (such as a
> QDBusPendingCallWatcher) until the remote method call is done.

Oh wow, that's unexpected. Would you please add comment saying this? It's totally code that someone would delete in the future if they just looked at it:)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-08: Posted in a previous version of this proposal

> > > if you don't care, why do you do this at all? I would think just calling
> > > createPaste and throwing away the returned QDBusPendingCall is enough.
> >
> > I also thought that when I first wrote it. But the destructor of a
> > QDBusPendingCall cancels the call if it's still ongoing and we don't want
> > that. Thus we have to keep a QDBusPendingCall instance around (such as a
> > QDBusPendingCallWatcher) until the remote method call is done.
>
> Oh wow, that's unexpected. Would you please add comment saying this? It's
> totally code that someone would delete in the future if they just looked at
> it:)

Sure, done.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:536
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/326/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2494/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2522/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/326/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/327/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-08-19: Posted in a previous version of this proposal

Am waiting for the silo to be rebuilt before testing. Code is fine however

review: Approve (code)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-24: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/346/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/347/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/352/rebuild

review: Needs Fixing (continuous-integration)

lp:~dandrader/qtmir/content-hub-clipboard updated on 2016-08-26

550. By Daniel d'Andrada on 2016-08-26

DBusFocusInfo.isPidFocused: search sessions recursively (LP: #1612166)

Approved by: Gerry Boland, Unity8 CI Bot

551. By Michał Sawicz on 2016-08-26

Revert r538 that's causing a unity8 crash when launching emergency dialer over greeter (LP: #1616842)

Approved by: Unity8 CI Bot

552. By CI Train Bot Account on 2016-08-26

Releasing 0.4.8+16.10.20160826.1-0ubuntu1

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/356/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2016-08-29:

I did not review the code (but Gerry did and liked it above). I did test silo 37 though and it worked fine (was able to copy/paste text from notification into app and the reverse).

CI is failing because of lttng apparently.

review: Approve (testing)

lp:~dandrader/qtmir/content-hub-clipboard updated on 2016-08-30

553. By Daniel d'Andrada on 2016-08-30

Merge lp:~unity-team/qtmir/persistent_surface_id

554. By Daniel d'Andrada on 2016-08-30

DBusFocusInfo: added isSurfaceFocused(serializedId)

555. By Daniel d'Andrada on 2016-08-30

Use content-hub for clipboard services

And remove our own implementation of such service

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-08-30 12:33:06 +0000
 +++ CMakeLists.txt	2016-08-30 12:33:06 +0000
@@ -85,6 +85,7 @@
  pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
  pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
  pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
++pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
  include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
 === modified file 'debian/control'
 --- debian/control	2016-08-30 12:33:06 +0000
 +++ debian/control	2016-08-30 12:33:06 +0000
@@ -7,6 +7,7 @@
                 debhelper (>= 9),
                 google-mock (>= 1.6.0+svn437),
                 libcgmanager-dev,
++               libcontent-hub-dev (>= 0.2),
                 libfontconfig1-dev,
                 libgles2-mesa-dev,
                 libglib2.0-dev,
 === modified file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
 --- src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-30 12:33:06 +0000
 +++ src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-30 12:33:06 +0000
@@ -24,6 +24,7 @@
  // QPA mirserver
  #include <logging.h>
++#include <shelluuid.h>
  #include <QDBusConnection>
@@ -99,8 +100,16 @@
  bool DBusFocusInfo::isSurfaceFocused(const QString &serializedId)
+ {
--    MirSurfaceInterface *qmlSurface = findQmlSurface(serializedId);
--    bool result = qmlSurface ? qmlSurface->activeFocus() : false;
++    // TODO: Implement a penalty for negative queries, such as stalling for some time before answering
++    //       further queries. That's in order to avoid brute-force approaches to find a valid surface id.
++    //       That's particularly important for shell's own surface id as it's always valid.
++    bool result = false;
++    if (serializedId == ShellUuId::toString()) {
++        result = true;
++    } else {
++        MirSurfaceInterface *qmlSurface = findQmlSurface(serializedId);
++        result = qmlSurface ? qmlSurface->activeFocus() : false;
++    }
      qCDebug(QTMIR_DBUS).nospace() << "DBusFocusInfo: isSurfaceFocused("<<serializedId<<") -> " << result;
      return result;
+ }
 === modified file 'src/platforms/mirserver/CMakeLists.txt'
 --- src/platforms/mirserver/CMakeLists.txt	2016-07-15 15:38:04 +0000
 +++ src/platforms/mirserver/CMakeLists.txt	2016-08-30 12:33:06 +0000
@@ -44,6 +44,8 @@
      ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
      ${APPLICATION_API_INCLUDE_DIRS}
++
++    ${CONTENT_HUB_INCLUDE_DIRS}
+ )
  # We have to remove -pedantic for tracepoints.c
@@ -66,6 +68,7 @@
      qmirserver_p.cpp
      sessionauthorizer.cpp
      sessionlistener.cpp
++    shelluuid.cpp
      surfaceobserver.cpp
      promptsessionlistener.cpp
      mirserver.cpp
@@ -112,6 +115,8 @@
      ${FONTCONFIG_LDFLAGS}
      ${XKBCOMMON_LIBRARIES}
++    ${CONTENT_HUB_LIBRARIES}
++
      Qt5::Core
      Qt5::DBus
      Qt5::Quick
 === modified file 'src/platforms/mirserver/clipboard.cpp'
 --- src/platforms/mirserver/clipboard.cpp	2016-06-06 19:25:20 +0000
 +++ src/platforms/mirserver/clipboard.cpp	2016-08-30 12:33:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
++ * Copyright (C) 2014,2016 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -15,245 +15,95 @@
   */
  #include "clipboard.h"
--#include "logging.h"
--
--// C++ std lib
--#include <utility>
--
--#include <QDBusConnection>
--#include <QDBusError>
--#include <QMimeData>
--
--// FIXME(loicm) The clipboard data format is not defined by Ubuntu Platform API
--//     which makes it impossible to have non-Qt applications communicate with Qt
--//     applications through the clipboard API. The solution would be to have
--//     Ubuntu Platform define the data format or propose an API that supports
--//     embedding different mime types in the clipboard.
--
--// Data format:
--//   number of mime types      (sizeof(int))
--//   data layout               ((4 * sizeof(int)) * number of mime types)
--//     mime type string offset (sizeof(int))
--//     mime type string size   (sizeof(int))
--//     data offset             (sizeof(int))
--//     data size               (sizeof(int))
--//   data                      (n bytes)
--
--namespace {
--
--const int maxFormatsCount = 16;
--
--}
--
--namespace qtmir {
--
--QByteArray serializeMimeData(QMimeData *mimeData)
--{
--    const QStringList formats = mimeData->formats();
--    const int formatCount = qMin(formats.size(), maxFormatsCount);
--    const int headerSize = sizeof(int) + (formatCount * 4 * sizeof(int));
--    int bufferSize = headerSize;
--
--    for (int i = 0; i < formatCount; i++)
--        bufferSize += formats[i].size() + mimeData->data(formats[i]).size();
--
--    // Serialize data.
--    QByteArray serializedMimeData(bufferSize, 0 /* char to fill with */);
--    {
--        char *buffer = serializedMimeData.data();
--        int* header = reinterpret_cast<int*>(serializedMimeData.data());
--        int offset = headerSize;
--        header[0] = formatCount;
--        for (int i = 0; i < formatCount; i++) {
--            const QByteArray data = mimeData->data(formats[i]);
--            const int formatOffset = offset;
--            const int formatSize = formats[i].size();
--            const int dataOffset = offset + formatSize;
--            const int dataSize = data.size();
--            memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
--            memcpy(&buffer[dataOffset], data.data(), dataSize);
--            header[i*4+1] = formatOffset;
--            header[i*4+2] = formatSize;
--            header[i*4+3] = dataOffset;
--            header[i*4+4] = dataSize;
--            offset += formatSize + dataSize;
--        }
--    }
--
--    return serializedMimeData;
--}
--
--QMimeData *deserializeMimeData(const QByteArray &serializedMimeData)
--{
--    if (static_cast<std::size_t>(serializedMimeData.size()) < sizeof(int)) {
--        // Data is invalid
--        return nullptr;
--    }
--
--    QMimeData *mimeData = new QMimeData;
--
--    const char* const buffer = serializedMimeData.constData();
--    const int* const header = reinterpret_cast<const int*>(serializedMimeData.constData());
--
--    const int count = qMin(header[0], maxFormatsCount);
--
--    for (int i = 0; i < count; i++) {
--        const int formatOffset = header[i*4+1];
--        const int formatSize = header[i*4+2];
--        const int dataOffset = header[i*4+3];
--        const int dataSize = header[i*4+4];
--
--        if (formatOffset + formatSize <= serializedMimeData.size()
--                && dataOffset + dataSize <= serializedMimeData.size()) {
--
--            QString mimeType = QString::fromLatin1(&buffer[formatOffset], formatSize);
--            QByteArray mimeDataBytes(&buffer[dataOffset], dataSize);
--
--            mimeData->setData(mimeType, mimeDataBytes);
--        }
--    }
--
--    return mimeData;
--}
--
--/************************************ DBusClipboard *****************************************/
--
--bool DBusClipboard::skipDBusRegistration = false;
--
--DBusClipboard::DBusClipboard(QObject *parent)
--    : QObject(parent)
--{
--    if (!skipDBusRegistration) {
--        performDBusRegistration();
--    }
--}
--
--void DBusClipboard::setContents(QByteArray newContents)
--{
--    setContentsHelper(std::move(newContents));
--}
--
--void DBusClipboard::SetContents(QByteArray newContents)
--{
--    qCDebug(QTMIR_CLIPBOARD, "D-Bus SetContents - %d bytes", newContents.size());
--
--    if (setContentsHelper(std::move(newContents))) {
--        Q_EMIT contentsChangedRemotely();
--    }
--}
--
--bool DBusClipboard::setContentsHelper(QByteArray newContents)
--{
--    if (newContents.size() > maxContentsSize) {
--        qCWarning(QTMIR_CLIPBOARD, "D-Bus clipboard refused the new contents (%d bytes) as they're"
--                " bigger than the maximum allowed size of %d bytes.",
--                newContents.size(), maxContentsSize);
--        return false;
--    }
--
--    if (newContents != m_contents) {
--        m_contents = std::move(newContents);
--        Q_EMIT ContentsChanged(m_contents);
--        return true;
--    } else {
--        return false;
--    }
--}
--
--QByteArray DBusClipboard::GetContents() const
--{
--    qCDebug(QTMIR_CLIPBOARD, "D-Bus GetContents - returning %d bytes", m_contents.size());
--    return m_contents;
--}
--
--void DBusClipboard::performDBusRegistration()
--{
--    QDBusConnection connection = QDBusConnection::sessionBus();
--    const char *serviceName = "com.canonical.QtMir";
--    const char *objectName = "/com/canonical/QtMir/Clipboard";
--
--    bool serviceOk = connection.registerService(serviceName);
--    if (!serviceOk) {
--        QDBusError error = connection.lastError();
--        QString errorMessage;
--        if (error.isValid()) {
--            errorMessage = error.message();
--        }
--        qCCritical(QTMIR_CLIPBOARD, "Failed to register service %s. %s", serviceName, qPrintable(errorMessage));
--    }
--
--    bool objectOk = connection.registerObject(objectName, this,
--                              QDBusConnection::ExportScriptableSignals
--                              | QDBusConnection::ExportScriptableSlots);
--    if (!objectOk) {
--        QDBusError error = connection.lastError();
--        QString errorMessage;
--        if (error.isValid()) {
--            errorMessage = error.message();
--        }
--        qCCritical(QTMIR_CLIPBOARD, "Failed to register object %s. %s", objectName, qPrintable(errorMessage));
--    }
--
--    if (serviceOk && objectOk) {
--        qCDebug(QTMIR_CLIPBOARD, "D-Bus registration successful.");
--    }
--}
--
--/************************************ Clipboard *****************************************/
--
--Clipboard::Clipboard(QObject *parent)
--    : QObject(parent)
--    , m_dbusClipboard(nullptr)
--{
--}
--
--QMimeData *Clipboard::mimeData(QClipboard::Mode mode)
--{
--    if (mode == QClipboard::Clipboard) {
--        return QPlatformClipboard::mimeData(mode);
--    } else {
--        return nullptr;
--    }
--}
--
--void Clipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
++#include "shelluuid.h"
++
++#include <QDBusPendingCallWatcher>
++#include <QSignalBlocker>
++
++// content-hub
++#include <com/ubuntu/content/hub.h>
++
++// get this cumbersome nested namespace out of the way
++using namespace com::ubuntu::content;
++
++using namespace qtmir;
++
++Clipboard::Clipboard()
++    : QObject(nullptr)
++    , m_mimeData(new QMimeData)
++    , m_contentHub(Hub::Client::instance())
++{
++    connect(m_contentHub, &Hub::pasteboardChanged, this, [this]() {
++        if (m_clipboardState == Clipboard::SyncedClipboard) {
++            m_clipboardState = Clipboard::OutdatedClipboard;
++            requestMimeData();
++        }
++    });
++
++    requestMimeData();
++}
++
++Clipboard::~Clipboard()
++{
++}
++
++QMimeData* Clipboard::mimeData(QClipboard::Mode mode)
+ {
      if (mode != QClipboard::Clipboard)
--        return;
--
--    if (m_dbusClipboard) {
--        QByteArray serializedMimeData = serializeMimeData(data);
--        m_dbusClipboard->setContents(std::move(serializedMimeData));
--    }
--
--    QPlatformClipboard::setMimeData(data, mode);
--}
--
--void Clipboard::setupDBusService()
--{
--    Q_ASSERT(!m_dbusClipboard);
--
--    m_dbusClipboard = new DBusClipboard(this);
--
--    connect(m_dbusClipboard, &DBusClipboard::contentsChangedRemotely,
--            this, &Clipboard::setMimeDataWithDBusClibpboardContents);
--}
--
--void Clipboard::setMimeDataWithDBusClibpboardContents()
--{
--    Q_ASSERT(m_dbusClipboard);
--    QMimeData *newMimeData = deserializeMimeData(m_dbusClipboard->contents());
--    if (newMimeData) {
--        // Don't call Clipboard::setMimeData as it will also propagate the change
--        // to the D-Bus clipboard, which doesn't make sense here as we're doing
--        // the other way round (propagating the D-Bus clipboard change to the local
--        // clipboard).
--        QPlatformClipboard::setMimeData(newMimeData, QClipboard::Clipboard);
--    } else {
--        qCWarning(QTMIR_CLIPBOARD, "Failed to deserialize D-Bus clipboard contents (%d bytes)",
--                m_dbusClipboard->contents().size());
--    }
--}
--
--} // namespace qtmir
--
++        return nullptr;
++
++    return m_mimeData.data();
++}
++
++void Clipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
++{
++    if (mode == QClipboard::Clipboard && mimeData != nullptr) {
++        QDBusPendingCall reply = m_contentHub->createPaste(ShellUuId::toString(), *mimeData);
++
++        // Don't care whether it succeeded
++        // But I have to keep a QDBusPendingCall instance around (such as this watcher) until
++        // the call is finished otherwise the QDBusPendingCall destructor will cancel the call
++        // if it's still ongoing.
++        auto *watcher = new QDBusPendingCallWatcher(reply, this);
++        connect(watcher, &QDBusPendingCallWatcher::finished,
++                watcher, &QObject::deleteLater);
++
++        m_mimeData.reset(mimeData);
++        m_clipboardState = SyncedClipboard;
++        emitChanged(QClipboard::Clipboard);
++    }
++}
++
++bool Clipboard::supportsMode(QClipboard::Mode mode) const
++{
++    return mode == QClipboard::Clipboard;
++}
++
++bool Clipboard::ownsMode(QClipboard::Mode mode) const
++{
++    Q_UNUSED(mode);
++    return false;
++}
++
++void Clipboard::updateMimeData()
++{
++    m_mimeData.reset(m_contentHub->latestPaste(ShellUuId::toString()));
++    m_clipboardState = SyncedClipboard;
++    emitChanged(QClipboard::Clipboard);
++}
++
++void Clipboard::requestMimeData()
++{
++    QDBusPendingCall reply = m_contentHub->requestLatestPaste(ShellUuId::toString());
++    m_clipboardState = SyncingClipboard;
++
++    m_pasteReply = new QDBusPendingCallWatcher(reply, this);
++    connect(m_pasteReply, &QDBusPendingCallWatcher::finished,
++            this, [this]() {
++        m_mimeData.reset(m_contentHub->paste(*m_pasteReply));
++        m_clipboardState = SyncedClipboard;
++        m_pasteReply->deleteLater();
++        m_pasteReply = nullptr;
++        emitChanged(QClipboard::Clipboard);
++    });
++}
 === modified file 'src/platforms/mirserver/clipboard.h'
 --- src/platforms/mirserver/clipboard.h	2015-08-11 12:08:32 +0000
 +++ src/platforms/mirserver/clipboard.h	2016-08-30 12:33:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -18,69 +18,52 @@
  #define QTMIR_CLIPBOARD_H
  #include <qpa/qplatformclipboard.h>
--#include <QObject>
++
++#include <QMimeData>
++#include <QScopedPointer>
++
++namespace com {
++    namespace ubuntu {
++        namespace content {
++            class Hub;
++        }
++    }
++}
++
++class QDBusPendingCallWatcher;
  namespace qtmir {
--class DBusClipboard : public QObject {
--    Q_OBJECT
--    Q_CLASSINFO("D-Bus Interface", "com.canonical.QtMir.Clipboard")
--public:
--    DBusClipboard(QObject *parent = nullptr);
--    virtual ~DBusClipboard() {}
--
--    void setContents(QByteArray contents);
--    const QByteArray &contents() const { return m_contents; }
--
--    static const int maxContentsSize = 4 * 1024 * 1024;  // 4 Mb
--
--    // To make it testable
--    static bool skipDBusRegistration;
--
--Q_SIGNALS:
--    Q_SCRIPTABLE void ContentsChanged(const QByteArray &contents);
--    void contentsChangedRemotely();
--
--public Q_SLOTS:
--    Q_SCRIPTABLE QByteArray GetContents() const;
--    Q_SCRIPTABLE void SetContents(QByteArray contents);
--
--private:
--    void performDBusRegistration();
--    bool setContentsHelper(QByteArray newContents);
--
--    // Contains a serialized QMimeData
--    // Serialization and deserialization is done by the QPlatformClipboard
--    // implementation.
--    QByteArray m_contents;
--};
--
  class Clipboard : public QObject, public QPlatformClipboard
+ {
      Q_OBJECT
  public:
--    Clipboard(QObject *parent = nullptr);
--    virtual ~Clipboard() {}
--
--    QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
--    void setMimeData(QMimeData *data, QClipboard::Mode mode) override;
--
--    void setupDBusService();
--
--private Q_SLOTS:
--    void setMimeDataWithDBusClibpboardContents();
++    Clipboard();
++    virtual ~Clipboard();
++
++    // QPlatformClipboard methods.
++    QMimeData* mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
++    void setMimeData(QMimeData* data, QClipboard::Mode mode = QClipboard::Clipboard) override;
++    bool supportsMode(QClipboard::Mode mode) const override;
++    bool ownsMode(QClipboard::Mode mode) const override;
  private:
--
--    DBusClipboard *m_dbusClipboard;
++    void updateMimeData();
++    void requestMimeData();
++
++    QScopedPointer<QMimeData> m_mimeData;
++
++    enum {
++        OutdatedClipboard, // Our mimeData is outdated, need to fetch latest from ContentHub
++        SyncingClipboard, // Our mimeData is outdated and we are waiting for ContentHub to reply with the latest paste
++        SyncedClipboard // Our mimeData is in sync with what ContentHub has
++    } m_clipboardState{OutdatedClipboard};
++
++    com::ubuntu::content::Hub *m_contentHub;
++
++    QDBusPendingCallWatcher *m_pasteReply{nullptr};
  };
--// NB: Copied from qtubuntu. Must be kept in sync with the original version!
--// Best thing would be to share this code somehow, but not bothering with it right now
--// as the clipboard will move to content-hub at some point.
--QByteArray serializeMimeData(QMimeData *mimeData);
--QMimeData *deserializeMimeData(const QByteArray &serializedMimeData);
--
  } // namespace qtmir
  #endif // QTMIR_CLIPBOARD_H
 === modified file 'src/platforms/mirserver/mirserverintegration.cpp'
 --- src/platforms/mirserver/mirserverintegration.cpp	2016-08-10 06:51:37 +0000
 +++ src/platforms/mirserver/mirserverintegration.cpp	2016-08-30 12:33:06 +0000
@@ -56,7 +56,6 @@
      , m_services(new Services)
      , m_mirServer(new QMirServer(argc, argv))
      , m_nativeInterface(nullptr)
--    , m_clipboard(new Clipboard)
+ {
      // For access to sensors, qtmir uses qtubuntu-sensors. qtubuntu-sensors reads the
      // UBUNTU_PLATFORM_API_BACKEND variable to decide if to load a valid sensor backend or not.
@@ -159,8 +158,6 @@
+     }
      m_nativeInterface = new NativeInterface(m_mirServer.data());
--
--    m_clipboard->setupDBusService();
+ }
  QPlatformAccessibility *MirServerIntegration::accessibility() const
@@ -196,7 +193,11 @@
  QPlatformClipboard *MirServerIntegration::clipboard() const
+ {
--    return m_clipboard.data();
++    static QPlatformClipboard *clipboard = nullptr;
++    if (!clipboard) {
++        clipboard = new Clipboard;
++    }
++    return clipboard;
+ }
  QPlatformOffscreenSurface *MirServerIntegration::createPlatformOffscreenSurface(
 === modified file 'src/platforms/mirserver/mirserverintegration.h'
 --- src/platforms/mirserver/mirserverintegration.h	2015-10-29 19:51:56 +0000
 +++ src/platforms/mirserver/mirserverintegration.h	2016-08-30 12:33:06 +0000
@@ -24,10 +24,6 @@
  class NativeInterface;
  class QMirServer;
--namespace qtmir {
--    class Clipboard;
--}
--
  class MirServerIntegration : public QPlatformIntegration
+ {
  public:
@@ -67,7 +63,6 @@
      NativeInterface *m_nativeInterface;
      QPlatformInputContext* m_inputContext;
--    QScopedPointer<qtmir::Clipboard> m_clipboard;
  };
  #endif // MIRSERVERINTEGRATION_H
 === added file 'src/platforms/mirserver/shelluuid.cpp'
 --- src/platforms/mirserver/shelluuid.cpp	1970-01-01 00:00:00 +0000
 +++ src/platforms/mirserver/shelluuid.cpp	2016-08-30 12:33:06 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "shelluuid.h"
++
++#include <QMutexLocker>
++
++using namespace qtmir;
++
++QUuid ShellUuId::m_uuid;
++QMutex ShellUuId::m_mutex;
++
++QString ShellUuId::toString()
++{
++    QMutexLocker mutexLocker(&m_mutex);
++
++    if (m_uuid.isNull()) {
++        m_uuid = QUuid::createUuid();
++    }
++
++    return m_uuid.toString();
++}
 === added file 'src/platforms/mirserver/shelluuid.h'
 --- src/platforms/mirserver/shelluuid.h	1970-01-01 00:00:00 +0000
 +++ src/platforms/mirserver/shelluuid.h	2016-08-30 12:33:06 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QUuid>
++#include <QMutex>
++
++namespace qtmir {
++
++/*
++    A UUID accessible by all shell code.
++ */
++class ShellUuId {
++public:
++    static QString toString();
++private:
++    static QUuid m_uuid;
++    static QMutex m_mutex;
++};
++
++} // namespace qtmir
 === modified file 'tests/mirserver/CMakeLists.txt'
 --- tests/mirserver/CMakeLists.txt	2016-04-13 14:25:42 +0000
 +++ tests/mirserver/CMakeLists.txt	2016-08-30 12:33:06 +0000
@@ -1,6 +1,5 @@
  add_subdirectory(ArgvHelper)
  add_subdirectory(QtEventFeeder)
--add_subdirectory(Clipboard)
  add_subdirectory(Screen)
  add_subdirectory(ScreensModel)
  add_subdirectory(WindowManager)
 === removed directory 'tests/mirserver/Clipboard'
 === removed file 'tests/mirserver/Clipboard/CMakeLists.txt'
 --- tests/mirserver/Clipboard/CMakeLists.txt	2016-06-06 18:12:07 +0000
 +++ tests/mirserver/Clipboard/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
--set(
--  CLIPBOARD_TEST_SOURCES
--  clipboard_test.cpp
--  ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
--)
--
--include_directories(
--  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
--)
--
--include_directories(
--  SYSTEM
--  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
--  ${MIRSERVER_INCLUDE_DIRS}
--)
--
--add_executable(ClipboardTest ${CLIPBOARD_TEST_SOURCES})
--
--target_link_libraries(
--  ClipboardTest
--  qpa-mirserver
--
--  ${GTEST_BOTH_LIBRARIES}
--  ${GMOCK_LIBRARIES}
--)
--
--add_test(Clipboard, ClipboardTest)
 === removed file 'tests/mirserver/Clipboard/clipboard_test.cpp'
 --- tests/mirserver/Clipboard/clipboard_test.cpp	2015-08-11 12:08:32 +0000
 +++ tests/mirserver/Clipboard/clipboard_test.cpp	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include <gtest/gtest.h>
--
--#include <clipboard.h>
--
--#include <QLoggingCategory>
--#include <QMimeData>
--
--using namespace qtmir;
--
--TEST(ClipboardTest, MimeDataSerialization)
--{
--    QMimeData *mimeData = new QMimeData;
--    mimeData->setData("text/plain", "Hello World!");
--    mimeData->setData("text/html", "<html lang=\"en\"><body>Hello World!</body></html>");
--
--    QByteArray serializedMimeData = serializeMimeData(mimeData);
--
--    ASSERT_TRUE(serializedMimeData.size() > 0);
--
--    QMimeData *deserializedMimeData = deserializeMimeData(serializedMimeData);
--
--    ASSERT_TRUE(deserializedMimeData != nullptr);
--
--    ASSERT_TRUE(deserializedMimeData->hasFormat("text/plain"));
--    ASSERT_EQ(mimeData->data("text/plain"), deserializedMimeData->data("text/plain"));
--
--    ASSERT_TRUE(deserializedMimeData->hasFormat("text/html"));
--    ASSERT_EQ(mimeData->data("text/html"), deserializedMimeData->data("text/html"));
--
--    delete mimeData;
--    delete deserializedMimeData;
--}
--
--TEST(ClipboardTest, RefuseContentsThatAreTooBig)
--{
--    QLoggingCategory::setFilterRules(QStringLiteral("*=false"));
--    DBusClipboard::skipDBusRegistration = true;
--    DBusClipboard *dbusClipboard = new DBusClipboard;
--
--    // Was getting a "warning: overflow in implicit constant conversion [-Woverflow]"
--    // when I used that constant directly in the QByteArray constructors below. Don't
--    // understand why so here's the workaround for it.
--    int maxContentsSize = DBusClipboard::maxContentsSize;
--
--    QByteArray reasonableContents(maxContentsSize * 0.9, 'R');
--    QByteArray tooBigContents(maxContentsSize * 1.2, 'B');
--
--    dbusClipboard->SetContents(reasonableContents);
--
--    ASSERT_EQ(dbusClipboard->contents(), reasonableContents);
--
--    dbusClipboard->SetContents(tooBigContents);
--
--    // tooBigContents were refused. So it stays with the previously
--    // set contents
--    ASSERT_EQ(dbusClipboard->contents(), reasonableContents);
--
--    delete dbusClipboard;
--}