Merge lp:~unity-team/qtmir/multiSurfaceApp into lp:qtmir

[Michał Sawicz]

Make Session hold multiple surfaces

+ Standardize MirSurface debug messages and account for multiple surfaces per app

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity8/multiSurfaceApp/+merge/279112

Because of prereq:
https://code.launchpad.net/~dandrader/unity-api/surfaceItemFillMode2/+merge/278955

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:353
http://jenkins.qa.ubuntu.com/job/qtmir-ci/353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/353/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/qtmir-ci/356/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/89/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/356/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Please merge trunk, many conflicts have appeared.

+void Session::appendSurface
+void Session::reallyAppendSurface
these names confuse me. Perhaps rename to something like:
appendSurface -> registerSurface
reallyAppendSurface -> appendSurface

 qDebug() << "Application::suspend - no surface to call stopFrameDropper() on!";
I think we can move this to category logging

+ return const_cast<ObjectListModel<MirSurfaceInterface>*>(&m_surfaces);
const_cast needed here? Can't the pointer be a pointer to a const object?

=== modified file 'src/modules/Unity/Application/session.h'
+ QList<MirSurfaceInterface*> m_blankSurfaces;
What use is this? I only see you append to and remove from this list, but never use it for anything.

+ Q_PROPERTY(MirSurfaceInterface* lastSurface READ lastSurface NOTIFY lastSurfaceChanged CONSTANT);
Can you add a "REMOVEME" comment to this, this is not an API I want to keep. It also not very correct, as what if the surface pointed to is removed, but other surfaces exist - should it not be updated?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:372
http://jenkins.qa.ubuntu.com/job/qtmir-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/144/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/411/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> Please merge trunk, many conflicts have appeared.

Done.

> +void Session::appendSurface
> +void Session::reallyAppendSurface
> these names confuse me. Perhaps rename to something like:
> appendSurface -> registerSurface
> reallyAppendSurface -> appendSurface

Done.

> qDebug() << "Application::suspend - no surface to call stopFrameDropper()
> on!";
> I think we can move this to category logging

Done.

> + return const_cast<ObjectListModel<MirSurfaceInterface>*>(&m_surfaces);
> const_cast needed here? Can't the pointer be a pointer to a const object?

Right. I was just blindly following the signature of childSessions. Fixed.

> === modified file 'src/modules/Unity/Application/session.h'
> + QList<MirSurfaceInterface*> m_blankSurfaces;
> What use is this? I only see you append to and remove from this list, but
> never use it for anything.

Originally it was meant to keep track of the surfaces that were registered but not yet appended. But later it turned out that this wasn't needed after all. Removed.

> + Q_PROPERTY(MirSurfaceInterface* lastSurface READ lastSurface NOTIFY
> lastSurfaceChanged CONSTANT);
> Can you add a "REMOVEME" comment to this, this is not an API I want to keep.
> It also not very correct, as what if the surface pointed to is removed, but
> other surfaces exist - should it not be updated?

This will be removed once unity8 starts using Session.surfaces. Ie, once it actually starts supporting multiple surfaces per application. It was just way too awkward to have untiy8 fetching the last surface from Session.surfaces in QML. Hence this property.

Added the FIXME comment to the property declaration.

lastSurface is being updated correctly as the surfaces model changes.

[Gerry Boland (gerboland)]

Code looks ok to me. There's a unity8 change needed to enable this fully though. Could you please link that MP here.

review: Approve (code)

[Daniel d'Andrada (dandrader)]

> Code looks ok to me. There's a unity8 change needed to enable this fully
> though. Could you please link that MP here.

Done

[Michael Zanetti (mzanetti)]

I've tested it and it works.

review: Approve (functional testing)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:419
http://jenkins.qa.ubuntu.com/job/qtmir-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/277
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/159
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/159/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/581/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/qtmir-ci/587/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/165/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/587/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/qtmir-ci/588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/166/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/588/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:425
http://jenkins.qa.ubuntu.com/job/qtmir-ci/598/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/176/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/598/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

have a bunch of build failures here

tests/framework/fake_mirsurface.h:113: Error: Not a signal declaration

trying with -DNO_TESTS:

In file included from /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp:1:0:
/home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.h:33:10: error: ‘void qtmir::Mir::setCursorName(const QString&)’ marked ‘override’, but does not override
     void setCursorName(const QString &cursorName) override;
          ^
/home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.h:34:13: error: ‘QString qtmir::Mir::cursorName() const’ marked ‘override’, but does not override
     QString cursorName() const override;
             ^
/home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp: In member function ‘void qtmir::Mir::setCursorName(const QString&)’:
/home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp:26:46: error: ‘cursorNameChanged’ was not declared in this scope
         Q_EMIT cursorNameChanged(m_cursorName);

Also got this when trying to build on the phone

/home/phablet/real_home/qtmir-multiSurfaceApp/src/modules/Unity/Application/session.cpp:315:65: error: 'm_surface' was not declared in this scope
     qCDebug(QTMIR_SESSIONS) << "Session::close - " << name() << m_surface;
                                                                 ^
/home/phablet/real_home/qtmir-multiSurfaceApp/src/modules/Unity/Application/session.cpp:316:9: error: 'm_surface' was not declared in this scope
     if (m_surface) {
         ^

Not sure if the last one is just masked by the other on my desktop build or if you fixed that in the meantime.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 04/12/2015 14:12, Michael Zanetti wrote:
> Review: Needs Fixing
>
> have a bunch of build failures here
>
> tests/framework/fake_mirsurface.h:113: Error: Not a signal declaration
>
> trying with -DNO_TESTS:
>
> In file included from /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp:1:0:
> /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.h:33:10: error: ‘void qtmir::Mir::setCursorName(const QString&)’ marked ‘override’, but does not override
> void setCursorName(const QString &cursorName) override;
> ^
> /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.h:34:13: error: ‘QString qtmir::Mir::cursorName() const’ marked ‘override’, but does not override
> QString cursorName() const override;
> ^
> /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp: In member function ‘void qtmir::Mir::setCursorName(const QString&)’:
> /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingleton.cpp:26:46: error: ‘cursorNameChanged’ was not declared in this scope
> Q_EMIT cursorNameChanged(m_cursorName);
>
>
>
> Also got this when trying to build on the phone
>
> /home/phablet/real_home/qtmir-multiSurfaceApp/src/modules/Unity/Application/session.cpp:315:65: error: 'm_surface' was not declared in this scope
> qCDebug(QTMIR_SESSIONS) << "Session::close - " << name() << m_surface;
> ^
> /home/phablet/real_home/qtmir-multiSurfaceApp/src/modules/Unity/Application/session.cpp:316:9: error: 'm_surface' was not declared in this scope
> if (m_surface) {
> ^
>
> Not sure if the last one is just masked by the other on my desktop build or if you fixed that in the meantime.

Just built it here. You sure you had
lp:~dandrader/unity-api/surfaceItemFillMode2 installed?

[Daniel d'Andrada (dandrader)]

> On 04/12/2015 14:12, Michael Zanetti wrote:
> > Review: Needs Fixing
> >
> > have a bunch of build failures here
> >
> > tests/framework/fake_mirsurface.h:113: Error: Not a signal declaration
> >
> > trying with -DNO_TESTS:
> >
> > In file included from /home/micha/Develop/reviews/multiSurfaceApp/src/platfo
> rms/mirserver/mirsingleton.cpp:1:0:
> > /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingl
> eton.h:33:10: error: ‘void qtmir::Mir::setCursorName(const QString&)’ marked
> ‘override’, but does not override
> > void setCursorName(const QString &cursorName) override;
> > ^
> > /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingl
> eton.h:34:13: error: ‘QString qtmir::Mir::cursorName() const’ marked
> ‘override’, but does not override
> > QString cursorName() const override;
> > ^
> > /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingl
> eton.cpp: In member function ‘void qtmir::Mir::setCursorName(const QString&)’:
> > /home/micha/Develop/reviews/multiSurfaceApp/src/platforms/mirserver/mirsingl
> eton.cpp:26:46: error: ‘cursorNameChanged’ was not declared in this scope
> > Q_EMIT cursorNameChanged(m_cursorName);
> >
> >
> >
> > Also got this when trying to build on the phone
> >
> > /home/phablet/real_home/qtmir-
> multiSurfaceApp/src/modules/Unity/Application/session.cpp:315:65: error:
> 'm_surface' was not declared in this scope
> > qCDebug(QTMIR_SESSIONS) << "Session::close - " << name() << m_surface;
> > ^
> > /home/phablet/real_home/qtmir-
> multiSurfaceApp/src/modules/Unity/Application/session.cpp:316:9: error:
> 'm_surface' was not declared in this scope
> > if (m_surface) {
> > ^
> >
> > Not sure if the last one is just masked by the other on my desktop build or
> if you fixed that in the meantime.
>
>
>
> Just built it here. You sure you had
> lp:~dandrader/unity-api/surfaceItemFillMode2 installed?

sorry, I was building unity8 instead.

Fixed. It was due to a bad merge with polite-close.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/qtmir-ci/603/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/181/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/603/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/qtmir-ci/605/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/301/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/301/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/183/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/605/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Will approve on the grounds it has been tested in silo, and code looks reasonable. Code has changed a bit since I approved it before, and lost history makes it hard to see what changed.

review: Approve

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-12-07 12:03:42 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-12-07 12:03:42 +0000
@@ -35,6 +35,8 @@
 
 using namespace qtmir;
 
+#define DEBUG_MSG qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "," << appId() <<"]::" << __func__
+
 namespace {
 
 // Would be better if QMouseEvent had nativeModifiers
@@ -217,7 +219,7 @@
     Q_ASSERT(m_views.isEmpty());
 
     if (m_session) {
-        m_session->setSurface(nullptr);
+        m_session->removeSurface(this);
     }
 
     QMutexLocker locker(&m_mutex);
@@ -301,12 +303,11 @@
 
         locker.unlock();
         if (updateTexture()) {
-            qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::dropPendingBuffer() dropped=1 left=" << framesPending-1;
+            DEBUG_MSG << "() dropped=1 left=" << framesPending-1;
         } else {
             // If we haven't managed to update the texture, don't keep banging away.
             m_frameDropperTimer.stop();
-            qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::dropPendingBuffer() dropped=0"
-                                              << " left=" << framesPending << " - failed to upate texture";
+            DEBUG_MSG << "() dropped=0" << " left=" << framesPending << " - failed to upate texture";
         }
         Q_EMIT frameDropped();
     } else {
@@ -320,13 +321,13 @@
 
 void MirSurface::stopFrameDropper()
 {
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::stopFrameDropper()";
+    DEBUG_MSG << "()";
     m_frameDropperTimer.stop();
 }
 
 void MirSurface::startFrameDropper()
 {
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::startFrameDropper()";
+    DEBUG_MSG << "()";
     if (!m_frameDropperTimer.isActive()) {
         m_frameDropperTimer.start();
     }
@@ -421,12 +422,11 @@
     // Temporary hotfix for http://pad.lv/1483752
     if (m_session->childSessions()->rowCount() > 0) {
         // has child trusted session, ignore any focus change attempts
-        qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::setFocus(" << focus
-            << ") - has child trusted session, ignore any focus change attempts";
+        DEBUG_MSG << "(" << focus << ") - has child trusted session, ignore any focus change attempts";
         return;
     }
 
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::setFocus(" << focus << ")";
+    DEBUG_MSG << "(" << focus << ")";
 
     if (focus) {
         m_shell->set_surface_attribute(m_session->session(), m_surface, mir_surface_attrib_focus, mir_surface_focused);
@@ -452,9 +452,8 @@
     if (clientIsRunning() && mirSizeIsDifferent) {
         mir::geometry::Size newMirSize(width, height);
         m_surface->resize(newMirSize);
-        qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::resize"
-                << " old (" << mirWidth << "," << mirHeight << ")"
-                << ", new (" << width << "," << height << ")";
+        DEBUG_MSG << " old (" << mirWidth << "," << mirHeight << ")"
+                  << ", new (" << width << "," << height << ")";
     }
 }
 
@@ -681,8 +680,7 @@
 void MirSurface::registerView(qintptr viewId)
 {
     m_views.insert(viewId, MirSurface::View{false});
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::registerView(" << viewId << ")"
-                                      << " after=" << m_views.count();
+    DEBUG_MSG << "(" << viewId << ")" << " after=" << m_views.count();
     if (m_views.count() == 1) {
         Q_EMIT isBeingDisplayedChanged();
     }
@@ -690,9 +688,8 @@
 
 void MirSurface::unregisterView(qintptr viewId)
 {
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::unregisterView(" << viewId << ")"
-                                      << " after=" << m_views.count() << " live=" << m_live;
     m_views.remove(viewId);
+    DEBUG_MSG << "(" << viewId << ")" << " after=" << m_views.count() << " live=" << m_live;
     if (m_views.count() == 0) {
         Q_EMIT isBeingDisplayedChanged();
         if (m_session.isNull() || !m_live) {
@@ -723,7 +720,7 @@
     }
 
     if (newVisible != visible()) {
-        qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::updateVisibility(" << newVisible << ")";
+        DEBUG_MSG << "(" << newVisible << ")";
 
         m_surface->configure(mir_surface_attrib_visibility,
                              newVisible ? mir_surface_visibility_exposed : mir_surface_visibility_occluded);
@@ -767,8 +764,7 @@
 
 void MirSurface::setCursor(const QCursor &cursor)
 {
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::setCursor("
-        << qtCursorShapeToStr(cursor.shape()) << ")";
+    DEBUG_MSG << "(" << qtCursorShapeToStr(cursor.shape()) << ")";
 
     m_cursor = cursor;
     Q_EMIT cursorChanged(m_cursor);

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-12-07 12:03:42 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-12-07 12:03:42 +0000
@@ -236,8 +236,6 @@
     QSGDefaultImageNode *node = static_cast<QSGDefaultImageNode*>(oldNode);
     if (!node) {
         node = new QSGDefaultImageNode;
-        node->setTexture(m_textureProvider->texture());
-
         node->setMipmapFiltering(QSGTexture::None);
         node->setHorizontalWrapMode(QSGTexture::ClampToEdge);
         node->setVerticalWrapMode(QSGTexture::ClampToEdge);
@@ -246,6 +244,7 @@
             node->markDirty(QSGNode::DirtyMaterial);
         }
     }
+    node->setTexture(m_textureProvider->texture());
 
     if (m_fillMode == PadOrCrop) {
         const QSize &textureSize = m_textureProvider->texture()->textureSize();

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2015-10-09 15:35:05 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2015-12-07 12:03:42 +0000
@@ -110,7 +110,7 @@
     }
 
     if (session)
-        session->setSurface(qmlSurface);
+        session->registerSurface(qmlSurface);
 
     // Only notify QML of surface creation once it has drawn its first frame.
     connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2015-12-07 12:03:42 +0000
+++ src/modules/Unity/Application/session.cpp	2015-12-07 12:03:42 +0000
@@ -68,7 +68,6 @@
     : SessionInterface(parent)
     , m_session(session)
     , m_application(nullptr)
-    , m_surface(nullptr)
     , m_parentSession(nullptr)
     , m_children(new SessionModel(this))
     , m_fullscreen(false)
@@ -108,10 +107,15 @@
 void Session::doSuspend()
 {
     Q_ASSERT(m_state == Session::Suspending);
-    if (m_surface) {
-        m_surface->stopFrameDropper();
+
+
+    auto surfaceList = m_surfaces.list();
+    if (surfaceList.empty()) {
+        qCDebug(QTMIR_SESSIONS) << "Application::suspend - no surface to call stopFrameDropper() on!";
     } else {
-        qDebug() << "Application::suspend - no surface to call stopFrameDropper() on!";
+        for (int i = 0; i < surfaceList.count(); ++i) {
+            surfaceList[i]->stopFrameDropper();
+        }
     }
     setState(Suspended);
 }
@@ -142,14 +146,9 @@
     return m_application;
 }
 
-MirSurfaceInterface* Session::surface() const
+const ObjectListModel<MirSurfaceInterface>* Session::surfaces() const
 {
-    // Only notify QML of surface creation once it has drawn its first frame.
-    if (m_surface && m_surface->isFirstFrameDrawn()) {
-        return m_surface;
-    } else {
-        return nullptr;
-    }
+    return &m_surfaces;
 }
 
 SessionInterface* Session::parentSession() const
@@ -191,55 +190,57 @@
     Q_EMIT applicationChanged(application);
 }
 
-void Session::setSurface(MirSurfaceInterface *newSurface)
+void Session::registerSurface(MirSurfaceInterface *newSurface)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::setSurface - session=" << name() << "surface=" << newSurface;
-
-    if (newSurface == m_surface) {
-        return;
-    }
-
-    if (m_surface) {
-        m_surface->disconnect(this);
-    }
-
-    MirSurfaceInterface *previousSurface = surface();
-    m_surface = newSurface;
-
-    if (newSurface) {
-        connect(newSurface, &MirSurfaceInterface::stateChanged,
-            this, &Session::updateFullscreenProperty);
-
-        // Only notify QML of surface creation once it has drawn its first frame.
-        if (m_surface->isFirstFrameDrawn()) {
-            setState(Running);
-        } else {
-            connect(newSurface, &MirSurfaceInterface::firstFrameDrawn,
-                    this, &Session::onFirstSurfaceFrameDrawn);
-        }
-    }
-
-    if (previousSurface != surface()) {
-        qCDebug(QTMIR_SESSIONS).nospace() << "Session::surfaceChanged - session=" << this
-            << " surface=" << m_surface;
-        Q_EMIT surfaceChanged(m_surface);
+    qCDebug(QTMIR_SESSIONS) << "Session::resgisterSurface - session=" << name() << "surface=" << newSurface;
+
+    // Only notify QML of surface creation once it has drawn its first frame.
+    if (newSurface->isFirstFrameDrawn()) {
+        appendSurface(newSurface);
+    } else {
+        connect(newSurface, &MirSurfaceInterface::firstFrameDrawn,
+                this, [this, newSurface]() { this->appendSurface(newSurface); });
     }
 
     updateFullscreenProperty();
 }
 
-void Session::onFirstSurfaceFrameDrawn()
-{
-    qCDebug(QTMIR_SESSIONS).nospace() << "Session::surfaceChanged - session=" << this
-        << " surface=" << m_surface;
-    Q_EMIT surfaceChanged(m_surface);
-    setState(Running);
+void Session::appendSurface(MirSurfaceInterface *newSurface)
+{
+    qCDebug(QTMIR_SESSIONS) << "Session::appendSurface - session=" << name() << "surface=" << newSurface;
+
+    connect(newSurface, &MirSurfaceInterface::stateChanged,
+        this, &Session::updateFullscreenProperty);
+
+    m_surfaces.insert(m_surfaces.rowCount(), newSurface);
+
+    Q_EMIT lastSurfaceChanged(newSurface);
+
+    if (m_state == Starting) {
+        setState(Running);
+    }
+}
+
+void Session::removeSurface(MirSurfaceInterface* surface)
+{
+    qCDebug(QTMIR_SESSIONS) << "Session::removeSurface - session=" << name() << "surface=" << surface;
+
+    surface->disconnect(this);
+
+    if (m_surfaces.contains(surface)) {
+        bool lastSurfaceWasRemoved = lastSurface() == surface;
+        m_surfaces.remove(surface);
+        if (lastSurfaceWasRemoved) {
+            Q_EMIT lastSurfaceChanged(lastSurface());
+        }
+    }
 }
 
 void Session::updateFullscreenProperty()
 {
-    if (m_surface) {
-        setFullscreen(m_surface->state() == Mir::FullscreenState);
+    if (m_surfaces.rowCount() > 0) {
+        // TODO: Figure out something better
+        setFullscreen(m_surfaces.list().at(0)->state() == Mir::FullscreenState);
     } else {
         // Keep the current value of the fullscreen property until we get a new
         // surface
@@ -289,8 +290,11 @@
         Q_ASSERT(m_suspendTimer->isActive());
         m_suspendTimer->stop();
     } else if (m_state == Suspended) {
-        Q_ASSERT(m_surface);
-        m_surface->startFrameDropper();
+        Q_ASSERT(m_surfaces.rowCount() > 0);
+        auto surfaceList = m_surfaces.list();
+        for (int i = 0; i < surfaceList.count(); ++i) {
+            surfaceList[i]->startFrameDropper();
+        }
     }
 
     session()->set_lifecycle_state(mir_lifecycle_state_resumed);
@@ -308,9 +312,11 @@
 
 void Session::close()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::close - " << name() << m_surface;
-    if (m_surface) {
-        m_surface->close();
+    qCDebug(QTMIR_SESSIONS) << "Session::close - " << name();
+
+    auto surfaceList = m_surfaces.list();
+    for (int i = 0; i < surfaceList.count(); ++i) {
+        surfaceList[i]->close();
     }
 }
 
@@ -321,10 +327,16 @@
     if (m_state != Stopped) {
 
         stopPromptSessions();
+
         if (m_suspendTimer->isActive())
             m_suspendTimer->stop();
-        if (m_surface)
-            m_surface->stopFrameDropper();
+
+        {
+            auto surfaceList = m_surfaces.list();
+            for (int i = 0; i < surfaceList.count(); ++i) {
+                surfaceList[i]->stopFrameDropper();
+            }
+        }
 
         foreachChildSession([](SessionInterface* session) {
             session->stop();
@@ -460,4 +472,13 @@
     }
 }
 
+MirSurfaceInterface* Session::lastSurface() const
+{
+    if (m_surfaces.rowCount() > 0) {
+        return m_surfaces.list().last();
+    } else {
+        return nullptr;
+    }
+}
+
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/session.h'
--- src/modules/Unity/Application/session.h	2015-12-07 12:03:42 +0000
+++ src/modules/Unity/Application/session.h	2015-12-07 12:03:42 +0000
@@ -52,14 +52,17 @@
     //getters
     QString name() const override;
     unity::shell::application::ApplicationInfoInterface* application() const override;
-    MirSurfaceInterface* surface() const override;
+    MirSurfaceInterface* lastSurface() const override;
+    const ObjectListModel<MirSurfaceInterface>* surfaces() const override;
     SessionInterface* parentSession() const override;
     State state() const override;
     bool fullscreen() const override;
     bool live() const override;
 
     void setApplication(unity::shell::application::ApplicationInfoInterface* item) override;
-    void setSurface(MirSurfaceInterface* surface) override;
+
+    void registerSurface(MirSurfaceInterface* surface) override;
+    void removeSurface(MirSurfaceInterface* surface) override;
 
     void suspend() override;
     void resume() override;
@@ -89,7 +92,6 @@
 
 private Q_SLOTS:
     void updateFullscreenProperty();
-    void onFirstSurfaceFrameDrawn();
 
 private:
     void setParentSession(Session* session);
@@ -98,9 +100,11 @@
 
     void stopPromptSessions();
 
+    void appendSurface(MirSurfaceInterface* surface);
+
     std::shared_ptr<mir::scene::Session> m_session;
     Application* m_application;
-    MirSurfaceInterface* m_surface;
+    ObjectListModel<MirSurfaceInterface> m_surfaces;
     SessionInterface* m_parentSession;
     SessionModel* m_children;
     bool m_fullscreen;

=== modified file 'src/modules/Unity/Application/session_interface.h'
--- src/modules/Unity/Application/session_interface.h	2015-12-07 12:03:42 +0000
+++ src/modules/Unity/Application/session_interface.h	2015-12-07 12:03:42 +0000
@@ -24,8 +24,12 @@
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
 // local
+#include "objectlistmodel.h"
 #include "sessionmodel.h"
 
+// Qt
+#include <QQmlListProperty>
+
 namespace mir {
     namespace scene {
         class Session;
@@ -39,7 +43,12 @@
 
 class SessionInterface : public QObject {
     Q_OBJECT
-    Q_PROPERTY(MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
+
+    // FIXME: Remove this once unity8 starts trully supporting multiple surfaces per applicaton.
+    //        Ie, remove this once untiy8 moves from using this property to using the surfaces one.
+    Q_PROPERTY(MirSurfaceInterface* lastSurface READ lastSurface NOTIFY lastSurfaceChanged);
+
+    Q_PROPERTY(const ObjectListModel<MirSurfaceInterface>* surfaces READ surfaces CONSTANT);
     Q_PROPERTY(unity::shell::application::ApplicationInfoInterface* application READ application NOTIFY applicationChanged DESIGNABLE false)
     Q_PROPERTY(SessionInterface* parentSession READ parentSession NOTIFY parentSessionChanged DESIGNABLE false)
     Q_PROPERTY(SessionModel* childSessions READ childSessions DESIGNABLE false CONSTANT)
@@ -62,7 +71,8 @@
     //getters
     virtual QString name() const = 0;
     virtual unity::shell::application::ApplicationInfoInterface* application() const = 0;
-    virtual MirSurfaceInterface* surface() const = 0;
+    virtual MirSurfaceInterface* lastSurface() const = 0;
+    virtual const ObjectListModel<MirSurfaceInterface>* surfaces() const = 0;
     virtual SessionInterface* parentSession() const = 0;
     virtual SessionModel* childSessions() const = 0;
     virtual State state() const = 0;
@@ -73,7 +83,8 @@
 
     // For MirSurface and MirSurfaceManager use
 
-    virtual void setSurface(MirSurfaceInterface* surface) = 0;
+    virtual void registerSurface(MirSurfaceInterface* surface) = 0;
+    virtual void removeSurface(MirSurfaceInterface* surface) = 0;
 
     // For Application use
 
@@ -99,16 +110,17 @@
     virtual void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>& session) = 0;
 
 Q_SIGNALS:
-    void surfaceChanged(MirSurfaceInterface*);
     void parentSessionChanged(SessionInterface*);
     void applicationChanged(unity::shell::application::ApplicationInfoInterface* application);
     void stateChanged(State state);
     void fullscreenChanged(bool fullscreen);
     void liveChanged(bool live);
+    void lastSurfaceChanged(MirSurfaceInterface* surface);
 };
 
 } // namespace qtmir
 
 Q_DECLARE_METATYPE(qtmir::SessionInterface*)
+Q_DECLARE_METATYPE(qtmir::ObjectListModel<qtmir::MirSurfaceInterface>*)
 
 #endif // SESSION_INTERFACE_H

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2015-12-07 12:03:42 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2015-12-07 12:03:42 +0000
@@ -50,7 +50,7 @@
 
         SessionInterface* qmlSession = sessionManager.findSession(mirSession);
         if (qmlSession) {
-            qmlSession->setSurface(qmlSurface);
+            qmlSession->registerSurface(qmlSurface);
         }
 
         // I assume that applicationManager ignores the mirSurface parameter, so sending

=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2015-10-08 11:20:30 +0000
+++ tests/modules/SessionManager/session_test.cpp	2015-12-07 12:03:42 +0000
@@ -58,7 +58,7 @@
     EXPECT_EQ(Session::Starting, session->state());
 
     FakeMirSurface *surface = new FakeMirSurface;
-    session->setSurface(surface);
+    session->registerSurface(surface);
 
     // Still on Starting as the surface hasn't drawn its first frame yet
     EXPECT_EQ(Session::Starting, session->state());
@@ -228,7 +228,7 @@
     auto session = std::make_shared<qtmir::Session>(mirSession, mirServer->the_prompt_session_manager());
     {
         FakeMirSurface *surface = new FakeMirSurface;
-        session->setSurface(surface);
+        session->registerSurface(surface);
         surface->drawFirstFrame();
     }
     EXPECT_EQ(Session::Running, session->state());
@@ -259,7 +259,7 @@
     auto session = std::make_shared<qtmir::Session>(mirSession, mirServer->the_prompt_session_manager());
     {
         FakeMirSurface *surface = new FakeMirSurface;
-        session->setSurface(surface);
+        session->registerSurface(surface);
         surface->drawFirstFrame();
     }
     EXPECT_EQ(Session::Running, session->state());

=== modified file 'tests/modules/common/fake_session.h'
--- tests/modules/common/fake_session.h	2015-12-07 12:03:42 +0000
+++ tests/modules/common/fake_session.h	2015-12-07 12:03:42 +0000
@@ -39,7 +39,8 @@
 
     QString name() const override { return QString("foo-session"); }
     unity::shell::application::ApplicationInfoInterface* application() const override { return m_application; }
-    MirSurfaceInterface* surface() const override { return nullptr; }
+    MirSurfaceInterface* lastSurface() const override { return nullptr; }
+    const ObjectListModel<MirSurfaceInterface>* surfaces() const override { return nullptr; }
     SessionInterface* parentSession() const override { return nullptr; }
     SessionModel* childSessions() const override { return nullptr; }
     State state() const override { return m_state; }
@@ -50,7 +51,8 @@
 
     // For MirSurfaceItem and MirSurfaceManager use
 
-    void setSurface(MirSurfaceInterface*) override {}
+    void registerSurface(MirSurfaceInterface*) override {}
+    void removeSurface(MirSurfaceInterface*) override {}
 
     // For Application use
 

=== modified file 'tests/modules/common/mock_session.h'
--- tests/modules/common/mock_session.h	2015-12-07 12:03:42 +0000
+++ tests/modules/common/mock_session.h	2015-12-07 12:03:42 +0000
@@ -36,16 +36,22 @@
 
     MOCK_CONST_METHOD0(name, QString());
     MOCK_CONST_METHOD0(application, unity::shell::application::ApplicationInfoInterface*());
-    MOCK_CONST_METHOD0(surface, MirSurfaceInterface*());
+    MOCK_CONST_METHOD0(lastSurface, MirSurfaceInterface*());
+    MOCK_CONST_METHOD0(surfaces, const ObjectListModel<MirSurfaceInterface>*());
     MOCK_CONST_METHOD0(parentSession, SessionInterface*());
+    MOCK_CONST_METHOD0(childSessions, SessionModel*());
 
     MOCK_CONST_METHOD0(state, State());
 
     MOCK_CONST_METHOD0(fullscreen, bool());
     MOCK_CONST_METHOD0(live, bool());
 
+    MOCK_CONST_METHOD0(session, std::shared_ptr<mir::scene::Session>());
+
+    MOCK_METHOD1(registerSurface, void(MirSurfaceInterface* surface));
+    MOCK_METHOD1(removeSurface, void(MirSurfaceInterface* surface));
+
     MOCK_METHOD1(setApplication, void(unity::shell::application::ApplicationInfoInterface* item));
-    MOCK_METHOD1(setSurface, void(MirSurfaceInterface* surface));
 
     MOCK_METHOD0(suspend, void());
     MOCK_METHOD0(resume, void());
@@ -57,13 +63,9 @@
     MOCK_METHOD1(removeChildSession, void(SessionInterface* session));
     MOCK_CONST_METHOD1(foreachChildSession, void(std::function<void(SessionInterface* session)> f));
 
-    MOCK_CONST_METHOD0(session, std::shared_ptr<mir::scene::Session>());
-
     MOCK_CONST_METHOD0(activePromptSession, std::shared_ptr<mir::scene::PromptSession>());
     MOCK_CONST_METHOD1(foreachPromptSession, void(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f));
 
-    MOCK_CONST_METHOD0(childSessions, SessionModel*());
-
     void setState(State state) {
         if (m_state != state) {
             m_state = state;