diff options
Diffstat (limited to 'Source/WebCore/Modules/proximity')
6 files changed, 34 insertions, 54 deletions
diff --git a/Source/WebCore/Modules/proximity/DeviceProximityClient.h b/Source/WebCore/Modules/proximity/DeviceProximityClient.h index c9c15a552..91e0dd567 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityClient.h +++ b/Source/WebCore/Modules/proximity/DeviceProximityClient.h @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DeviceProximityClient_h -#define DeviceProximityClient_h +#pragma once #if ENABLE(PROXIMITY_EVENTS) @@ -49,4 +48,3 @@ void provideDeviceProximityTo(Page*, DeviceProximityClient*); } // namespace WebCore #endif // PROXIMITY_EVENTS -#endif // DeviceProximityClient_h diff --git a/Source/WebCore/Modules/proximity/DeviceProximityController.cpp b/Source/WebCore/Modules/proximity/DeviceProximityController.cpp index a64d47ac6..68ea296af 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityController.cpp +++ b/Source/WebCore/Modules/proximity/DeviceProximityController.cpp @@ -40,11 +40,6 @@ DeviceProximityController::DeviceProximityController(DeviceProximityClient* clie ASSERT(m_client); } -PassOwnPtr<DeviceProximityController> DeviceProximityController::create(DeviceProximityClient* client) -{ - return adoptPtr(new DeviceProximityController(client)); -} - void DeviceProximityController::didChangeDeviceProximity(const double value, const double min, const double max) { ASSERT(value >= min && value <= max); @@ -62,7 +57,7 @@ bool DeviceProximityController::hasLastData() return deviceProximityClient()->hasLastData(); } -PassRefPtr<Event> DeviceProximityController::getLastEvent() +RefPtr<Event> DeviceProximityController::getLastEvent() { return DeviceProximityEvent::create(eventNames().webkitdeviceproximityEvent, deviceProximityClient()->value(), deviceProximityClient()->min(), deviceProximityClient()->max()); } @@ -86,7 +81,7 @@ bool DeviceProximityController::isActiveAt(Page* page) void provideDeviceProximityTo(Page* page, DeviceProximityClient* client) { - DeviceProximityController::provideTo(page, DeviceProximityController::supplementName(), DeviceProximityController::create(client)); + DeviceProximityController::provideTo(page, DeviceProximityController::supplementName(), std::make_unique<DeviceProximityController>(client)); } } // namespace WebCore diff --git a/Source/WebCore/Modules/proximity/DeviceProximityController.h b/Source/WebCore/Modules/proximity/DeviceProximityController.h index 9fd6ffb6d..5b30dfe47 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityController.h +++ b/Source/WebCore/Modules/proximity/DeviceProximityController.h @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DeviceProximityController_h -#define DeviceProximityController_h +#pragma once #if ENABLE(PROXIMITY_EVENTS) @@ -36,25 +35,20 @@ class DeviceProximityClient; class DeviceProximityController : public DeviceController { public: + explicit DeviceProximityController(DeviceProximityClient*); ~DeviceProximityController() { } - static PassOwnPtr<DeviceProximityController> create(DeviceProximityClient*); - void didChangeDeviceProximity(const double value, const double min, const double max); DeviceProximityClient* deviceProximityClient(); virtual bool hasLastData(); - virtual PassRefPtr<Event> getLastEvent(); + virtual RefPtr<Event> getLastEvent(); static const char* supplementName(); static DeviceProximityController* from(Page*); static bool isActiveAt(Page*); - -private: - explicit DeviceProximityController(DeviceProximityClient*); }; } // namespace WebCore #endif // PROXIMITY_EVENTS -#endif // DeviceProximityController_h diff --git a/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp b/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp index e32c0cb6d..06bf01eb9 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp +++ b/Source/WebCore/Modules/proximity/DeviceProximityEvent.cpp @@ -39,11 +39,11 @@ DeviceProximityEvent::DeviceProximityEvent(const AtomicString& eventType, const { } -DeviceProximityEvent::DeviceProximityEvent(const AtomicString& eventType, const DeviceProximityEventInit& initializer) - : Event(eventType, initializer) - , m_value(initializer.value) - , m_min(initializer.min) - , m_max(initializer.max) +DeviceProximityEvent::DeviceProximityEvent(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted) + : Event(eventType, initializer, isTrusted) + , m_value(initializer.value ? *initializer.value : std::numeric_limits<double>::infinity()) + , m_min(initializer.min ? *initializer.min : -std::numeric_limits<double>::infinity()) + , m_max(initializer.max ? *initializer.max : std::numeric_limits<double>::infinity()) { } diff --git a/Source/WebCore/Modules/proximity/DeviceProximityEvent.h b/Source/WebCore/Modules/proximity/DeviceProximityEvent.h index 0ece25413..373ac451e 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityEvent.h +++ b/Source/WebCore/Modules/proximity/DeviceProximityEvent.h @@ -17,8 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#ifndef DeviceProximityEvent_h -#define DeviceProximityEvent_h +#pragma once #if ENABLE(PROXIMITY_EVENTS) @@ -26,39 +25,29 @@ namespace WebCore { -struct DeviceProximityEventInit : public EventInit { - DeviceProximityEventInit() - : value(std::numeric_limits<double>::infinity()) - , min(-std::numeric_limits<double>::infinity()) - , max(std::numeric_limits<double>::infinity()) - { - // Default value of bubbles is true by the Proximity Events spec. - // http://www.w3.org/TR/proximity/#deviceproximityevent-interface - bubbles = true; - }; - - double value; - double min; - double max; -}; - class DeviceProximityEvent : public Event { public: ~DeviceProximityEvent() { } - static PassRefPtr<DeviceProximityEvent> create() + static Ref<DeviceProximityEvent> create() { - return adoptRef(new DeviceProximityEvent()); + return adoptRef(*new DeviceProximityEvent()); } - static PassRefPtr<DeviceProximityEvent> create(const AtomicString& eventType, const double value, const double min, const double max) + static Ref<DeviceProximityEvent> create(const AtomicString& eventType, const double value, const double min, const double max) { - return adoptRef(new DeviceProximityEvent(eventType, value, min, max)); + return adoptRef(*new DeviceProximityEvent(eventType, value, min, max)); } - static PassRefPtr<DeviceProximityEvent> create(const AtomicString& type, const DeviceProximityEventInit& initializer) + struct Init : EventInit { + std::optional<double> value; + std::optional<double> min; + std::optional<double> max; + }; + + static Ref<DeviceProximityEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) { - return adoptRef(new DeviceProximityEvent(type, initializer)); + return adoptRef(*new DeviceProximityEvent(type, initializer, isTrusted)); } double value() { return m_value; } @@ -70,7 +59,7 @@ public: private: DeviceProximityEvent(); DeviceProximityEvent(const AtomicString& eventType, const double value, const double min, const double max); - DeviceProximityEvent(const AtomicString& eventType, const DeviceProximityEventInit&); + DeviceProximityEvent(const AtomicString& eventType, const Init&, IsTrusted); double m_value; double m_min; @@ -80,4 +69,3 @@ private: } // namespace WebCore #endif // DeviceProximityEvent_h -#endif // PROXIMITY_EVENTS diff --git a/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl b/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl index 7fe014adf..7ecbfe78e 100644 --- a/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl +++ b/Source/WebCore/Modules/proximity/DeviceProximityEvent.idl @@ -19,10 +19,15 @@ [ Conditional=PROXIMITY_EVENTS, - ConstructorTemplate=Event, + Constructor(DOMString type, optional DeviceProximityEventInit eventInitDict), ] interface DeviceProximityEvent : Event { - [InitializedByEventConstructor] readonly attribute double value; - [InitializedByEventConstructor] readonly attribute double min; - [InitializedByEventConstructor] readonly attribute double max; + readonly attribute unrestricted double value; + readonly attribute unrestricted double min; + readonly attribute unrestricted double max; }; +dictionary DeviceProximityEventInit : EventInit { + double value; + double min; + double max; +}; |