Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 75 insertions, 0 deletions

diff --git a/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp b/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp
new file mode 100644
index 0000000..ccf7697
--- /dev/null
+++ b/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp
@@ -0,0 +1,75 @@
+/*
+ * 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"