Merge lp:~gerboland/unity-api/surfaceSizerCallback into lp:unity-api

[Gerry Boland]

AppMan: add surfaceAboutToBeCreatedCallback property to AppMan - allows QML shell override surface creation geometry

AppMan: add surfaceAboutToBeCreatedCallback property to AppMan - allows QML shell override surface creation geometry

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~gerboland/unity8/initialSurfaceGeometry/+merge/230490
https://code.launchpad.net/~gerboland/qtmir/initialSurfaceGeometry/+merge/230491
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y

[lp:~gerboland/unity-api/surfaceSizerCallback]

157. By Gerry Boland on 2014-08-12

Do not increment lib version, but header version

[Gerry Boland (gerboland)]

<Saviq> greyback, wonder, could this not ba Q_PROPERTY?
Maybe it could, in which case the API would be prettier. I'll see if it works

[Michał Sawicz (saviq)]

review: Needs Fixing

[Michał Sawicz (saviq)]

Oh and document the signature of the callable please. Will it get info about fullscreen, for example?

I wonder if instead we should just pass availableGeometry, with Mir being responsible for policy, should we involve the shell like this?

review: Needs Information

[lp:~gerboland/unity-api/surfaceSizerCallback]

158. By Gerry Boland on 2014-08-12

keep dch quiet

159. By Gerry Boland on 2014-08-12

Newer nicer API using properties (just one test failing)

160. By Gerry Boland on 2014-08-12

Implement a better mock and set a sensible default - fixes the test

[Gerry Boland (gerboland)]

> Oh and document the signature of the callable please. Will it get info about
> fullscreen, for example?
Sadly not, I need to add a feature request for Mir for that. IMO the surface type and other info that we get from a standard Mir surface would be good info to have, opposed to this limited subset.

> I wonder if instead we should just pass availableGeometry, with Mir being
> responsible for policy, should we involve the shell like this?
I dislike this idea, as effectively we'd need to educate Mir about the entire QML scene: which areas are off-limits for a non-fullscreen surfaces, what to do for surfaces of different types, stages, etc. Defining a vocabulary for that would be a nightmare IMO. And if Mir makes a decision that shell doesn't like, shell will immediately impose its will anyway - so where's the gain?

Policy I hope to define in Mir relate more to clients expectations, I want to ensure that client surfaces behave in a consistent way across mir server implementations. Shells should treat client surfaces in ways that they expect, that parent/child relationship is obeyed, focus handing is correct, input is delivered to the correct surface, siblings can attach to eachother/their parent and stay there, things like that.

[lp:~gerboland/unity-api/surfaceSizerCallback]

161. By Gerry Boland on 2014-08-12

debump

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/unity-api-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/253/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-api/surfaceSizerCallback]

162. By Gerry Boland on 2014-08-18

Update Changelog to exhibit new api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/unity-api-ci/256/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/91/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/256/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

> > I wonder if instead we should just pass availableGeometry, with Mir being
> > responsible for policy, should we involve the shell like this?
> I dislike this idea, as effectively we'd need to educate Mir about the entire
> QML scene: which areas are off-limits for a non-fullscreen surfaces, what to
> do for surfaces of different types, stages, etc. Defining a vocabulary for
> that would be a nightmare IMO. And if Mir makes a decision that shell doesn't
> like, shell will immediately impose its will anyway - so where's the gain?

I'm thinking about, for example, initial placement based on previous runs and such. Maybe Mir could (optionally?) give up a preferred position and the shell would come back with the same or changed if not possible in current setup or something. Anyway, later. The gain? More logic shared between Mir shells.

> Policy I hope to define in Mir relate more to clients expectations, I want to
> ensure that client surfaces behave in a consistent way across mir server
> implementations. Shells should treat client surfaces in ways that they expect,
> that parent/child relationship is obeyed, focus handing is correct, input is
> delivered to the correct surface, siblings can attach to eachother/their
> parent and stay there, things like that.

What you said above applies here just as well - shell, if not well behaved - can impose its own will.

[lp:~gerboland/unity-api/surfaceSizerCallback]

163. By Gerry Boland on 2014-08-19

[debian] change to UNRELEASED series, to please CI train

[Michał Sawicz (saviq)]

review: Needs Information

[Gerry Boland (gerboland)]

> I'm thinking about, for example, initial placement based on previous runs and
> such. Maybe Mir could (optionally?) give up a preferred position and the shell
> would come back with the same or changed if not possible in current setup or
> something. Anyway, later. The gain? More logic shared between Mir shells.

Yeah definitely, that's something Mir can give us, including saving the positions on close so it can inform us where it should re-open.

> > Policy I hope to define in Mir relate more to clients expectations, I want
> to
> > ensure that client surfaces behave in a consistent way across mir server
> > implementations. Shells should treat client surfaces in ways that they
> expect,
> > that parent/child relationship is obeyed, focus handing is correct, input is
> > delivered to the correct surface, siblings can attach to eachother/their
> > parent and stay there, things like that.
>
> What you said above applies here just as well - shell, if not well behaved -
> can impose its own will.

Sure. It's a line we have to walk carefully, but I think it's more important to try guarantee behaviour for clients. Mir can define that policy, and look after surface position/size save/restore, but I don't want to go down the road of trying to educate Mir of everything happening in the QML scene.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/unity-api-ci/257/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/92

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/257/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

> I tried:
>
> Binding {
> target: ApplicationManager
> property: "surfaceAboutToBeCreatedCallback"
> value: function surfaceSizer(surface) { print("Hihi")
> surface.width = 400;
> if (surface.appId && surface.appId == "dialer-app") {
> surface.height = 300;
> }
> return surface;
> }
> }
>
> and got this error:
> file:///usr/share/unity8/Stages/PhoneStage.qml:125:12: Unable to assign a function to a property of any type other than var.

Hah! Interesting. Can't say I understand. If Binding.value is of type
other than var, how can it be flexible enough? Otherwise if
ApplicationManager.surfaceAboutToBeCreatedCallback is not var, how would
your original approach to assign instead of bind work in any case?

I'd say that's worth a QTBUG.

[Gerry Boland (gerboland)]

> > I tried:
> >
> > Binding {
> > target: ApplicationManager
> > property: "surfaceAboutToBeCreatedCallback"
> > value: function surfaceSizer(surface) { print("Hihi")
> > surface.width = 400;
> > if (surface.appId && surface.appId == "dialer-app") {
> > surface.height = 300;
> > }
> > return surface;
> > }
> > }
> >
> > and got this error:
> > file:///usr/share/unity8/Stages/PhoneStage.qml:125:12: Unable to assign a
> function to a property of any type other than var.
>
> Hah! Interesting. Can't say I understand. If Binding.value is of type
> other than var, how can it be flexible enough? Otherwise if
> ApplicationManager.surfaceAboutToBeCreatedCallback is not var, how would
> your original approach to assign instead of bind work in any case?
>
> I'd say that's worth a QTBUG.

My guess is that Binding does some naive type checking, and QJSValue is indeed not a QVariant. qtdeclarative5:/src/qml/qml/qmlproperty.cpp does confirm that idea: http://pastebin.ubuntu.com/8099923/ - I don't understand why exactly..

I don't create a binding with my original approach, it's a simple assignment. I would guess the only way around this error is to replace QJSValue with a QVariant. What say you?

[Michał Sawicz (saviq)]

> My guess is that Binding does some naive type checking, and QJSValue is indeed not a QVariant. qtdeclarative5:/src/qml/qml/qmlproperty.cpp does confirm that idea:http://pastebin.ubuntu.com/8099923/ - I don't understand why exactly..

Yeah.

> I don't create a binding with my original approach, it's a simple assignment. I would guess the only way around this error is to replace QJSValue with a QVariant. What say you?

Doesn't sound like that would help, since you'd still need to go through
a Binding and that would complain that function is not a var.

So it looks like assignment is the only way indeed. Worth a QTBUG IMO.
If you can assign something to a property, you should be able to bind to.

[Michał Sawicz (saviq)]

Please rebase on lp:~dandrader/unity-api/lifecycle, no need to bump versions over that one then.

review: Needs Fixing

[lp:~gerboland/unity-api/surfaceSizerCallback]

164. By Gerry Boland on 2014-08-21

Undo application API version bump

165. By Gerry Boland on 2014-08-21

Merge lp:dandrader/unity-api/lifecycle and combine changelog entries to one

166. By Gerry Boland on 2014-08-21

Remove my changelog tweaks, train will do them

167. By Gerry Boland on 2014-09-02

Merge trunk

168. By Gerry Boland on 2014-10-07

Merge trunk

169. By Gerry Boland on 2014-11-05

Merge trunk

170. By Gerry Boland on 2014-12-08

Merge trunk & update changelog

171. By Gerry Boland on 2015-03-24

Merge trunk

172. By Gerry Boland on 2015-03-31

Add unity::shell::application::Globals

173. By Gerry Boland on 2015-07-13

Merge trunk

174. By Gerry Boland on 2015-07-13

Merge app-focus-state branch as prereq

175. By Gerry Boland on 2015-07-13

Document the Global class

176. By Gerry Boland on 2015-07-13

Revert 175

177. By Gerry Boland on 2015-07-13

Remove old Globals idea

178. By Gerry Boland on 2015-07-29

Merge trunk

179. By Gerry Boland on 2015-09-03

Merge trunk

180. By Gerry Boland on 2015-09-07

Remove bad merge atrifacts

Unmerged revisions

180. By Gerry Boland on 2015-09-07

Remove bad merge atrifacts

179. By Gerry Boland on 2015-09-03

Merge trunk

178. By Gerry Boland on 2015-07-29

Merge trunk

177. By Gerry Boland on 2015-07-13

Remove old Globals idea

176. By Gerry Boland on 2015-07-13

Revert 175

175. By Gerry Boland on 2015-07-13

Document the Global class

174. By Gerry Boland on 2015-07-13

Merge app-focus-state branch as prereq

173. By Gerry Boland on 2015-07-13

Merge trunk

172. By Gerry Boland on 2015-03-31

Add unity::shell::application::Globals

171. By Gerry Boland on 2015-03-24

Merge trunk

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-18 15:46:22 +0000
+++ CMakeLists.txt	2014-08-21 10:07:55 +0000
@@ -133,7 +133,7 @@
 # API version
 set(UNITY_API_MAJOR 0)
 set(UNITY_API_MINOR 1)
-set(UNITY_API_MICRO 4)
+set(UNITY_API_MICRO 5)
 set(UNITY_API_VERSION "${UNITY_API_MAJOR}.${UNITY_API_MINOR}.${UNITY_API_MICRO}")
 
 # API library

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-06 19:32:56 +0000
+++ debian/changelog	2014-08-21 10:07:55 +0000
@@ -1,3 +1,10 @@
+unity-api (7.89-0ubuntu1) UNRELEASED; urgency=medium
+
+  * AppMan: add surfaceAboutToBeCreatedCallback property to AppMan - allows QML shell override surface creation geometry
+  * ApplicationInfo - add updateScreenshot() and discardScreenshot()
+
+ -- Daniel d'Andrada <[e-mail]>  Fri, 08 Aug 2014 06:05:53 -0300
+
 unity-api (7.88+14.10.20140806-0ubuntu1) utopic; urgency=medium
 
   [ Michal Hruby ]

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2013-12-11 11:04:11 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2014-08-21 10:07:55 +0000
@@ -97,13 +97,6 @@
      */
     Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
 
-    /**
-     * @brief The URL of the app's screenshot to be used with the image provider.
-     *
-     * Holds the URL for the app's screenshot. This URL will change whenever the screenshot updates.
-     */
-    Q_PROPERTY(QUrl screenshot READ screenshot NOTIFY screenshotChanged)
-
 protected:
     /// @cond
     ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
@@ -152,7 +145,6 @@
     virtual Stage stage() const = 0;
     virtual State state() const = 0;
     virtual bool focused() const = 0;
-    virtual QUrl screenshot() const = 0;
     /// @endcond
 
 Q_SIGNALS:
@@ -163,7 +155,6 @@
     void stageChanged(Stage stage);
     void stateChanged(State state);
     void focusedChanged(bool focused);
-    void screenshotChanged(const QUrl &screenshot);
     /// @endcond
 };
 

=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
--- include/unity/shell/application/ApplicationManagerInterface.h	2014-03-10 12:40:25 +0000
+++ include/unity/shell/application/ApplicationManagerInterface.h	2014-08-21 10:07:55 +0000
@@ -24,6 +24,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QAbstractListModel>
+#include <QtQml/QJSValue>
 
 namespace unity
 {
@@ -66,6 +67,36 @@
      */
     Q_PROPERTY(bool suspended READ suspended WRITE setSuspended NOTIFY suspendedChanged)
 
+    /**
+     * @brief Register a Javascript function as a callback for when an application is asking to create a new surface
+     *
+     * Registers a Javascript callback function which ApplicationManager will call when an application is asking
+     * Mir to create a new surface. The function is passed a 'surface' object with properties width, height and
+     * appId. The shell can implement this function to return different width & height to override the geometry
+     * requested by the client.
+     *
+     * Example QML:
+     *
+     * function surfaceSizer(surface) {
+     *     surface.width = 400;
+     *     if (surface.appId && surface.appId == "dialer-app") {
+     *         surface.height = 300;
+     *     }
+     *     return surface;
+     * }
+     *
+     * Component.onCompleted {
+     *     ApplicationManager.surfaceAboutToBeCreatedCallback = surfaceSizer;
+     * }
+     * Component.onDestruction {
+     *     ApplicationManager.surfaceAboutToBeCreatedCallback = null;
+     * }
+     *
+     * Warning: the function must live in the QML context thread!
+     */
+    Q_PROPERTY(QJSValue surfaceAboutToBeCreatedCallback READ surfaceAboutToBeCreatedCallback
+               WRITE setSurfaceAboutToBeCreatedCallback NOTIFY surfaceAboutToBeCreatedCallbackChanged)
+
 protected:
     /// @cond
     ApplicationManagerInterface(QObject* parent = 0): QAbstractListModel(parent)
@@ -77,7 +108,6 @@
         m_roleNames.insert(RoleStage, "stage");
         m_roleNames.insert(RoleState, "state");
         m_roleNames.insert(RoleFocused, "focused");
-        m_roleNames.insert(RoleScreenshot, "screenshot");
 
         connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), SIGNAL(countChanged()));
         connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)), SIGNAL(countChanged()));
@@ -100,7 +130,6 @@
         RoleStage,
         RoleState,
         RoleFocused,
-        RoleScreenshot,
     };
 
     /// @cond
@@ -119,6 +148,9 @@
 
     virtual bool suspended() const = 0;
     virtual void setSuspended(bool suspended) = 0;
+
+    virtual QJSValue surfaceAboutToBeCreatedCallback() const = 0;
+    virtual void setSurfaceAboutToBeCreatedCallback(const QJSValue &callback) = 0;
     /// @endcond
 
     /**
@@ -185,21 +217,10 @@
       */
     Q_INVOKABLE virtual bool stopApplication(const QString &appId) = 0;
 
-    /**
-     * @brief Update the screenshot for an application.
-     *
-     * NOTE: Normally the ApplicationManager will update screenshots unfocusing or focusing apps,
-     * However, in cases where you need to show the screenshot while the application is still focused,
-     * you can request the ApplicationManager to update it now.
-     *
-     * @param appId The application for which the screenshot should be updated.
-     * @returns True if the screenshot update operation was scheduled successfully, false otherwise (i.e. the given appId could not be found)
-     */
-    Q_INVOKABLE virtual bool updateScreenshot(const QString &appId) = 0;
-
 Q_SIGNALS:
     /// @cond
     void countChanged();
+    void surfaceAboutToBeCreatedCallbackChanged();
     /// @endcond
 
     /**

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2014-03-04 10:50:44 +0000
+++ include/unity/shell/application/CMakeLists.txt	2014-08-21 10:07:55 +0000
@@ -7,10 +7,10 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 2)
-set(PKGCONFIG_NAME "unity-shell-appliction")
+set(VERSION 3)
+set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
-set(PKGCONFIG_REQUIRES "Qt5Core")
+set(PKGCONFIG_REQUIRES "Qt5Core Qt5Qml")
 set(PKGCONFIG_FILE unity-shell-application.pc)
 
 configure_file(${CMAKE_SOURCE_DIR}/data/unity-shell-api.pc.in

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt'
--- test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt	2013-08-29 12:54:56 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt	2014-08-21 10:07:55 +0000
@@ -19,7 +19,7 @@
 
 add_library(ApplicationMocks SHARED ${ApplicationMocks_SOURCES})
 
-qt5_use_modules(ApplicationMocks Core)
+qt5_use_modules(ApplicationMocks Core Qml)
 
 set(TestApplicationPlugin_SOURCES
     TestApplicationPlugin.cpp

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2013-12-11 11:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2014-08-21 10:07:55 +0000
@@ -54,11 +54,6 @@
     return m_icon;
 }
 
-QUrl MockApplicationInfo::screenshot() const
-{
-    return m_screenshot;
-}
-
 ApplicationInfoInterface::Stage MockApplicationInfo::stage() const
 {
     return m_stage;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2013-12-11 11:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2014-08-21 10:07:55 +0000
@@ -36,7 +36,6 @@
     QString name() const;
     QString comment() const;
     QUrl icon() const;
-    QUrl screenshot() const;
 
     ApplicationInfoInterface::Stage stage() const;
     void setStage(ApplicationInfoInterface::Stage stage);
@@ -52,7 +51,6 @@
     QString m_name;
     QString m_comment;
     QUrl m_icon;
-    QUrl m_screenshot;
     ApplicationInfoInterface::Stage m_stage;
     ApplicationInfoInterface::State m_state;
     bool m_focused;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-05-23 08:35:43 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-08-21 10:07:55 +0000
@@ -22,7 +22,9 @@
 
 using namespace unity::shell::application;
 
-MockApplicationManager::MockApplicationManager(QObject* parent): ApplicationManagerInterface(parent)
+MockApplicationManager::MockApplicationManager(QObject* parent)
+    : ApplicationManagerInterface(parent)
+    , m_surfaceAboutToBeCreatedCallback(QJSValue::UndefinedValue)
 {
     MockApplicationInfo *item = new MockApplicationInfo("phone-app", "Phone App", "Telephony application", QUrl("/usr/share/pixmaps/some/icon.png"), this);
     m_list.append(item);
@@ -66,8 +68,6 @@
         return item->state();
     case RoleFocused:
         return item->focused();
-    case RoleScreenshot:
-        return item->screenshot();
     }
 
     return QVariant();
@@ -139,8 +139,16 @@
     return true;
 }
 
-bool MockApplicationManager::updateScreenshot(const QString &appId)
-{
-    Q_UNUSED(appId)
-    return true;
+QJSValue MockApplicationManager::surfaceAboutToBeCreatedCallback() const
+{
+    return m_surfaceAboutToBeCreatedCallback;
+}
+
+void MockApplicationManager::setSurfaceAboutToBeCreatedCallback(const QJSValue &callback)
+{
+    if (m_surfaceAboutToBeCreatedCallback.equals(callback))
+        return;
+
+    m_surfaceAboutToBeCreatedCallback = callback;
+    Q_EMIT surfaceAboutToBeCreatedCallbackChanged();
 }

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-03-10 12:34:16 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-08-21 10:07:55 +0000
@@ -43,6 +43,9 @@
     bool suspended() const;
     void setSuspended(bool suspended);
 
+    QJSValue surfaceAboutToBeCreatedCallback() const;
+    void setSurfaceAboutToBeCreatedCallback(const QJSValue &callback);
+
     Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const;
 
     Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const;
@@ -57,10 +60,9 @@
 
     Q_INVOKABLE bool stopApplication(const QString &appId);
 
-    Q_INVOKABLE bool updateScreenshot(const QString &appId);
-
 private:
     QList<MockApplicationInfo*> m_list;
+    QJSValue m_surfaceAboutToBeCreatedCallback;
 };
 
 #endif // MOCKAPPLICATIONMANAGER_H

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt'
--- test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt	2013-09-11 15:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt	2014-08-21 10:07:55 +0000
@@ -27,7 +27,7 @@
 
 add_library(LauncherMocks SHARED ${LauncherMocks_SOURCES})
 
-qt5_use_modules(LauncherMocks Core)
+qt5_use_modules(LauncherMocks Core Qml)
 
 set(TestLauncherPlugin_SOURCES
     TestLauncherPlugin.cpp

=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
--- test/qmltest/unity/shell/application/tst_Application.qml	2014-03-10 12:34:16 +0000
+++ test/qmltest/unity/shell/application/tst_Application.qml	2014-08-21 10:07:55 +0000
@@ -59,6 +59,11 @@
             }
         }
 
+        function initTestCase() {
+            function surfaceSizer(surface) { return surface; }
+            ApplicationManager.surfaceAboutToBeCreatedCallback = surfaceSizer;
+        }
+
         /* make sure all the required roles are exposed on ApplicationManager */
         function test_model_roles_enum_data() {
             return [
@@ -69,7 +74,6 @@
                         { enum: "RoleStage" },
                         { enum: "RoleState" },
                         { enum: "RoleFocused" },
-                        { enum: "RoleScreenshot" },
                     ];
         }
 
@@ -89,7 +93,6 @@
                         { tag: "ApplicationManager.roles[stage]", role: "stage", type: "number" },
                         { tag: "ApplicationManager.roles[state]", role: "state", type: "number" },
                         { tag: "ApplicationManager.roles[focused]", role: "focused", type: "boolean" },
-                        { tag: "ApplicationManager.roles[screenshot]", role: "screenshot", type: "object" },
                     ];
         }
 
@@ -113,7 +116,6 @@
                 { tag: "ApplicationManager.methods[unfocusCurrentApplication]", method: "unfocusCurrentApplication" },
                 { tag: "ApplicationManager.methods[startApplication]", method: "startApplication" },
                 { tag: "ApplicationManager.methods[stopApplication]", method: "stopApplication" },
-                { tag: "ApplicationManager.methods[updateScreenshot]", method: "updateScreenshot" },
             ];
         }
 
@@ -128,6 +130,7 @@
                 { tag: "ApplicationManager.count", property: "count", type: "number" },
                 { tag: "ApplicationManager.focusedApplicationId", property: "focusedApplicationId", type: "string" },
                 { tag: "ApplicationManager.suspended", property: "suspended", type: "boolean" },
+                { tag: "ApplicationManager.surfaceAboutToBeCreatedCallback", property: "surfaceAboutToBeCreatedCallback", type: "function" },
             ];
         }
 
@@ -146,7 +149,6 @@
                 { tag: "ApplicationInfo.properties[stage]", property: "stage", type: "number" },
                 { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" },
                 { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" },
-                { tag: "ApplicationInfo.properties[screenshot]", property: "screenshot", type: "object" },
             ];
         }