From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/dom/DeviceOrientationEvent.cpp | 50 +++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/dom/DeviceOrientationEvent.cpp') diff --git a/Source/WebCore/dom/DeviceOrientationEvent.cpp b/Source/WebCore/dom/DeviceOrientationEvent.cpp index 97b919e59..e06ec3170 100644 --- a/Source/WebCore/dom/DeviceOrientationEvent.cpp +++ b/Source/WebCore/dom/DeviceOrientationEvent.cpp @@ -27,7 +27,6 @@ #include "DeviceOrientationEvent.h" #include "DeviceOrientationData.h" -#include "EventNames.h" namespace WebCore { @@ -46,15 +45,60 @@ DeviceOrientationEvent::DeviceOrientationEvent(const AtomicString& eventType, De { } -void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, DeviceOrientationData* orientation) +std::optional DeviceOrientationEvent::alpha() const +{ + return m_orientation->alpha(); +} + +std::optional DeviceOrientationEvent::beta() const +{ + return m_orientation->beta(); +} + +std::optional DeviceOrientationEvent::gamma() const +{ + return m_orientation->gamma(); +} + +#if PLATFORM(IOS) + +std::optional DeviceOrientationEvent::compassHeading() const +{ + return m_orientation->compassHeading(); +} + +std::optional DeviceOrientationEvent::compassAccuracy() const +{ + return m_orientation->compassAccuracy(); +} + +void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, std::optional alpha, std::optional beta, std::optional gamma, std::optional compassHeading, std::optional compassAccuracy) { if (dispatched()) return; initEvent(type, bubbles, cancelable); - m_orientation = orientation; + m_orientation = DeviceOrientationData::create(alpha, beta, gamma, compassHeading, compassAccuracy); +} + +#else + +std::optional DeviceOrientationEvent::absolute() const +{ + return m_orientation->absolute(); } +void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, std::optional alpha, std::optional beta, std::optional gamma, std::optional absolute) +{ + if (dispatched()) + return; + + initEvent(type, bubbles, cancelable); + m_orientation = DeviceOrientationData::create(alpha, beta, gamma, absolute); +} + +#endif + EventInterface DeviceOrientationEvent::eventInterface() const { #if ENABLE(DEVICE_ORIENTATION) -- cgit v1.2.1