diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp')
-rw-r--r-- | WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp b/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp deleted file mode 100644 index ccf7697..0000000 --- a/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ -#include "config.h" -#include "DeviceMotionProviderQt.h" - -#include "DeviceOrientationProviderQt.h" - -namespace WebCore { - -DeviceMotionProviderQt::DeviceMotionProviderQt() -{ - m_acceleration.addFilter(this); - m_motion = DeviceMotionData::create(); - m_deviceOrientation = new DeviceOrientationProviderQt(); -} - -DeviceMotionProviderQt::~DeviceMotionProviderQt() -{ - delete m_deviceOrientation; -} - -void DeviceMotionProviderQt::start() -{ - m_acceleration.start(); - m_deviceOrientation->start(); -} - -void DeviceMotionProviderQt::stop() -{ - m_acceleration.stop(); - m_deviceOrientation->stop(); -} - -bool DeviceMotionProviderQt::filter(QAccelerometerReading* reading) -{ - RefPtr<DeviceMotionData::Acceleration> accel = DeviceMotionData::Acceleration::create( - /* x available */ true, reading->x(), - /* y available */ true, reading->y(), - /* z available */ true, reading->z()); - - RefPtr<DeviceMotionData::RotationRate> rotation = DeviceMotionData::RotationRate::create( - m_deviceOrientation->hasAlpha(), m_deviceOrientation->orientation()->alpha(), - /* beta available */ true, m_deviceOrientation->orientation()->beta(), - /* gamma available */ true, m_deviceOrientation->orientation()->gamma()); - - m_motion = DeviceMotionData::create(accel, - accel, /* FIXME: Needs to provide acceleration include gravity. */ - rotation, - false, 0 /* The interval is treated internally by Qt mobility */); - - emit deviceMotionChanged(); - - return false; -} - -} // namespace WebCore - -#include "moc_DeviceMotionProviderQt.cpp" |