bd7958392d
The method was missing a check whether the weak pointers in the internal list got deleted. This could in very unlikely cases lead to a crash. In order to verify that adding the null pointer check fixes the crash a unit test is added to simulate the situation of a pointer being deleted. This required to add a mock a few classes of TabBox. A MockTabBoxHandler and MockTabBoxClient are added implementing the specific interfaces. The DeclarativeView is completely mocked to make the linker happy. Including the actual implementation is not possible as it pulls in half of KWin core. BUG: 303840 FIXED-IN: 4.9.0 REVIEW: 105645
99 lines
3.2 KiB
C++
99 lines
3.2 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "mock_tabboxhandler.h"
|
|
#include "mock_tabboxclient.h"
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
MockTabBoxHandler::MockTabBoxHandler()
|
|
: TabBoxHandler()
|
|
{
|
|
}
|
|
|
|
MockTabBoxHandler::~MockTabBoxHandler()
|
|
{
|
|
}
|
|
|
|
void MockTabBoxHandler::grabbedKeyEvent(QKeyEvent *event) const
|
|
{
|
|
Q_UNUSED(event)
|
|
}
|
|
|
|
QWeakPointer< TabBox::TabBoxClient > MockTabBoxHandler::activeClient() const
|
|
{
|
|
if (!m_windows.isEmpty()) {
|
|
return QWeakPointer< TabBox::TabBoxClient >(m_windows.first());
|
|
}
|
|
return QWeakPointer<TabBox::TabBoxClient>();
|
|
}
|
|
|
|
QWeakPointer< TabBox::TabBoxClient > MockTabBoxHandler::clientToAddToList(TabBox::TabBoxClient *client, int desktop) const
|
|
{
|
|
Q_UNUSED(desktop)
|
|
QList< QSharedPointer< TabBox::TabBoxClient > >::const_iterator it = m_windows.constBegin();
|
|
for (; it != m_windows.constEnd(); ++it) {
|
|
if ((*it).data() == client) {
|
|
return QWeakPointer< TabBox::TabBoxClient >(*it);
|
|
}
|
|
}
|
|
return QWeakPointer< TabBox::TabBoxClient >();
|
|
}
|
|
|
|
QWeakPointer< TabBox::TabBoxClient > MockTabBoxHandler::nextClientFocusChain(TabBox::TabBoxClient *client) const
|
|
{
|
|
if (!client) {
|
|
if (!m_windows.isEmpty()) {
|
|
return QWeakPointer< TabBox::TabBoxClient >(m_windows.first());
|
|
}
|
|
}
|
|
QList< QSharedPointer< TabBox::TabBoxClient > >::const_iterator it = m_windows.constBegin();
|
|
for (; it != m_windows.constEnd(); ++it) {
|
|
if ((*it).data() == client) {
|
|
++it;
|
|
if (it == m_windows.constEnd()) {
|
|
return QWeakPointer< TabBox::TabBoxClient >(m_windows.first());
|
|
} else {
|
|
return QWeakPointer< TabBox::TabBoxClient >(*it);
|
|
}
|
|
}
|
|
}
|
|
return QWeakPointer< TabBox::TabBoxClient >();
|
|
}
|
|
|
|
QWeakPointer< TabBox::TabBoxClient > MockTabBoxHandler::createMockWindow(const QString &caption, WId id)
|
|
{
|
|
QSharedPointer< TabBox::TabBoxClient > client(new MockTabBoxClient(caption, id));
|
|
m_windows.append(client);
|
|
return QWeakPointer< TabBox::TabBoxClient >(client);
|
|
}
|
|
|
|
void MockTabBoxHandler::closeWindow(TabBox::TabBoxClient *client)
|
|
{
|
|
QList< QSharedPointer< TabBox::TabBoxClient > >::iterator it = m_windows.begin();
|
|
for (; it != m_windows.end(); ++it) {
|
|
if ((*it).data() == client) {
|
|
m_windows.erase(it);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace KWin
|