~aacid/qtmir/fix_leaks_application_manager

~aacid/qtmir/fix_leaks_application_manager_test

Viewing changes to src/modules/Unity/Application/mirsurfacemanager.cpp

Committer: CI Train Bot
Author(s): Alan Griffiths
Date: 2016-05-20 08:41:29 UTC
mfrom: (484.2.11 qtmir0)
Revision ID: ci-train-bot@canonical.com-20160520084129-co95olzpjkt1z4lh

Reduce coupling to MirServer - it has been misused as a context object.
Approved by: Alan Griffiths, Unity8 CI Bot, Daniel d'Andrada

files modified:
src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/offscreensurface.cpp

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/surfaceobserver.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/mirsurfacemanager.cpp

// QPA mirserver

#include "nativeinterface.h"

#include "mirserver.h"

#include "sessionlistener.h"

#include "logging.h"

#include "creationhints.h"

// mir

#include <mir/scene/surface.h>

Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")

namespace ms = mir::scene;

}

SessionListener *sessionListener = static_cast<SessionListener*>(nativeInterface->nativeResourceForIntegration("SessionListener"));

MirShell *shell = static_cast<MirShell*>(nativeInterface->nativeResourceForIntegration("Shell"));

mir::shell::Shell *shell = static_cast<mir::shell::Shell*>(nativeInterface->nativeResourceForIntegration("Shell"));

instance = new MirSurfaceManager(nativeInterface->mirServer(), shell, SessionManager::singleton());

instance = new MirSurfaceManager(shell, SessionManager::singleton());

connectToSessionListener(instance, sessionListener);

}

MirSurfaceManager::MirSurfaceManager(

const QSharedPointer<MirServer>& mirServer,

MirShell *shell,

mir::shell::Shell* shell,

SessionManager* sessionManager,

QObject *parent)

QObject* parent)

: QObject(parent)

, m_mirServer(mirServer)

, m_shell(shell)

, m_sessionManager(sessionManager)

{

Older »