Changeset 233515 in webkit

Timestamp:

Jul 5, 2018, 4:42:00 AM (8 years ago)

Author:

svillar@igalia.com

Message:

[WebVR] Fix VRDisplayEvent implementation
​https://bugs.webkit.org/show_bug.cgi?id=187337

Reviewed by Žan Doberšek.

VRDisplayEvent implementation had two issues. First there were no attributes storing the
VRDisplay the event refers to. Secondly the VRDisplayEventReason is not mandatory so it
should be handled via an optional.

• Modules/webvr/VRDisplayEvent.cpp:

(WebCore::VRDisplayEvent::VRDisplayEvent):
(WebCore::VRDisplayEvent::display const): Deleted.
(WebCore::VRDisplayEvent::reason const): Deleted.

• Modules/webvr/VRDisplayEvent.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webvr/VRDisplayEvent.cpp (modified) (1 diff)
• Modules/webvr/VRDisplayEvent.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-05  Sergio Villar Senin  <svillar@igalia.com>
+
+        [WebVR] Fix VRDisplayEvent implementation
+        https://bugs.webkit.org/show_bug.cgi?id=187337
+
+        Reviewed by Žan Doberšek.
+
+        VRDisplayEvent implementation had two issues. First there were no attributes storing the
+        VRDisplay the event refers to. Secondly the VRDisplayEventReason is not mandatory so it
+        should be handled via an optional.
+
+        * Modules/webvr/VRDisplayEvent.cpp:
+        (WebCore::VRDisplayEvent::VRDisplayEvent):
+        (WebCore::VRDisplayEvent::display const): Deleted.
+        (WebCore::VRDisplayEvent::reason const): Deleted.
+        * Modules/webvr/VRDisplayEvent.h:
+
 2018-07-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/Modules/webvr/VRDisplayEvent.cpp

@@ -32 +32 @@
 VRDisplayEvent::VRDisplayEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted)
     : Event(type, initializer, isTrusted)
+    , m_display(initializer.display)
+    , m_reason(initializer.reason)
+{
+}
+
+VRDisplayEvent::VRDisplayEvent(const AtomicString& name, const RefPtr<VRDisplay>& display, std::optional<VRDisplayEventReason>&& reason)
+    : Event(name, false /*canBubble*/, false /*cancelable*/)
+    , m_display(display)
+    , m_reason(WTFMove(reason))
 {
 }
 
 VRDisplayEvent::~VRDisplayEvent() = default;
-
-RefPtr<VRDisplay> VRDisplayEvent::display() const
-{
-    return nullptr;
-}
-
-VRDisplayEventReason VRDisplayEvent::reason() const
-{
-    return VRDisplayEventReason::Mounted;
-}
 
 EventInterface VRDisplayEvent::eventInterface() const

trunk/Source/WebCore/Modules/webvr/VRDisplayEvent.h

@@ -34 +34 @@
 class VRDisplayEvent final : public Event {
 public:
+    static Ref<VRDisplayEvent> create(const AtomicString& type, const RefPtr<VRDisplay>& display, std::optional<VRDisplayEventReason>&& reason)
+    {
+        return adoptRef(*new VRDisplayEvent(type, display, WTFMove(reason)));
+    }
+
     struct Init : EventInit {
         RefPtr<VRDisplay> display;
-        VRDisplayEventReason reason;
+        std::optional<VRDisplayEventReason> reason;
     };
 
@@ -46 +51 @@
     virtual ~VRDisplayEvent();
 
-    RefPtr<VRDisplay> display() const;
-    VRDisplayEventReason reason() const;
+    RefPtr<VRDisplay> display() const { return m_display; }
+    const std::optional<VRDisplayEventReason>& reason() const { return m_reason; }
 
 private:
     VRDisplayEvent(const AtomicString&, const Init&, IsTrusted);
+    VRDisplayEvent(const AtomicString&, const RefPtr<VRDisplay>&, std::optional<VRDisplayEventReason>&&);
 
     // Event
     EventInterface eventInterface() const override;
+
+    RefPtr<VRDisplay> m_display;
+    std::optional<VRDisplayEventReason> m_reason;
 };