webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 109 deletions

diff --git a/Source/WebCore/dom/DeviceOrientationData.cpp b/Source/WebCore/dom/DeviceOrientationData.cpp
index d6a5f2cf4..885912600 100644
--- a/Source/WebCore/dom/DeviceOrientationData.cpp
+++ b/Source/WebCore/dom/DeviceOrientationData.cpp
@@ -28,134 +28,38 @@
 
 namespace WebCore {
 
-PassRefPtr<DeviceOrientationData> DeviceOrientationData::create()
-{
-    return adoptRef(new DeviceOrientationData);
-}
-
 #if PLATFORM(IOS)
-// FIXME: We should reconcile the iOS and OpenSource differences.
-PassRefPtr<DeviceOrientationData> DeviceOrientationData::create(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideCompassHeading, double compassHeading, bool canProvideCompassAccuracy, double compassAccuracy)
-{
-    return adoptRef(new DeviceOrientationData(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma, canProvideCompassHeading, compassHeading, canProvideCompassAccuracy, compassAccuracy));
-}
-#else
-PassRefPtr<DeviceOrientationData> DeviceOrientationData::create(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideAbsolute, bool absolute)
-{
-    return adoptRef(new DeviceOrientationData(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma, canProvideAbsolute, absolute));
-}
-#endif
 
-
-DeviceOrientationData::DeviceOrientationData()
-    : m_canProvideAlpha(false)
-    , m_canProvideBeta(false)
-    , m_canProvideGamma(false)
-#if !PLATFORM(IOS)
-    , m_canProvideAbsolute(false)
-#endif
-    , m_alpha(0)
-    , m_beta(0)
-    , m_gamma(0)
-#if PLATFORM(IOS)
-    , m_canProvideCompassHeading(false)
-    , m_canProvideCompassAccuracy(false)
-#else
-    , m_absolute(false)
-#endif
+// FIXME: We should reconcile the iOS and OpenSource differences.
+Ref<DeviceOrientationData> DeviceOrientationData::create(std::optional<double> alpha, std::optional<double> beta, std::optional<double> gamma, std::optional<double> compassHeading, std::optional<double> compassAccuracy)
 {
+    return adoptRef(*new DeviceOrientationData(alpha, beta, gamma, compassHeading, compassAccuracy));
 }
 
-#if PLATFORM(IOS)
-DeviceOrientationData::DeviceOrientationData(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideCompassHeading, double compassHeading, bool canProvideCompassAccuracy, double compassAccuracy)
-    : m_canProvideAlpha(canProvideAlpha)
-    , m_canProvideBeta(canProvideBeta)
-    , m_canProvideGamma(canProvideGamma)
-    , m_alpha(alpha)
+DeviceOrientationData::DeviceOrientationData(std::optional<double> alpha, std::optional<double> beta, std::optional<double> gamma, std::optional<double> compassHeading, std::optional<double> compassAccuracy)
+    : m_alpha(alpha)
     , m_beta(beta)
     , m_gamma(gamma)
-    , m_canProvideCompassHeading(canProvideCompassHeading)
-    , m_canProvideCompassAccuracy(canProvideCompassAccuracy)
     , m_compassHeading(compassHeading)
     , m_compassAccuracy(compassAccuracy)
-#else
-DeviceOrientationData::DeviceOrientationData(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideAbsolute, bool absolute)
-    : m_canProvideAlpha(canProvideAlpha)
-    , m_canProvideBeta(canProvideBeta)
-    , m_canProvideGamma(canProvideGamma)
-    , m_canProvideAbsolute(canProvideAbsolute)
-    , m_alpha(alpha)
-    , m_beta(beta)
-    , m_gamma(gamma)
-    , m_absolute(absolute)
-#endif
 {
 }
 
-double DeviceOrientationData::alpha() const
-{
-    return m_alpha;
-}
-
-double DeviceOrientationData::beta() const
-{
-    return m_beta;
-}
-
-double DeviceOrientationData::gamma() const
-{
-    return m_gamma;
-}
-
-#if !PLATFORM(IOS)
-bool DeviceOrientationData::absolute() const
-{
-    return m_absolute;
-}
-#endif
-
-bool DeviceOrientationData::canProvideAlpha() const
-{
-    return m_canProvideAlpha;
-}
-
-bool DeviceOrientationData::canProvideBeta() const
-{
-    return m_canProvideBeta;
-}
-
-bool DeviceOrientationData::canProvideGamma() const
-{
-    return m_canProvideGamma;
-}
-
-#if PLATFORM(IOS)
-double DeviceOrientationData::compassHeading() const
-{
-    return m_compassHeading;
-}
-
-double DeviceOrientationData::compassAccuracy() const
-{
-    return m_compassAccuracy;
-}
+#else
 
-bool DeviceOrientationData::canProvideCompassHeading() const
+Ref<DeviceOrientationData> DeviceOrientationData::create(std::optional<double> alpha, std::optional<double> beta, std::optional<double> gamma, std::optional<bool> absolute)
 {
-    return m_canProvideCompassHeading;
+    return adoptRef(*new DeviceOrientationData(alpha, beta, gamma, absolute));
 }
 
-bool DeviceOrientationData::canProvideCompassAccuracy() const
+DeviceOrientationData::DeviceOrientationData(std::optional<double> alpha, std::optional<double> beta, std::optional<double> gamma, std::optional<bool> absolute)
+    : m_alpha(alpha)
+    , m_beta(beta)
+    , m_gamma(gamma)
+    , m_absolute(absolute)
 {
-    return m_canProvideCompassAccuracy;
 }
-#endif
 
-#if !PLATFORM(IOS)
-bool DeviceOrientationData::canProvideAbsolute() const
-{
-    return m_canProvideAbsolute;
-}
 #endif
 
 } // namespace WebCore