Changeset 230502 in webkit

Timestamp:

Apr 10, 2018 4:38:29 PM (6 years ago)

Author:

Chris Dumez

Message:

Unreviewed build fix.

Those enum value names were too generic and would cause conflicts.

• Modules/webvr/VRDisplayCapabilities.h:

(WebCore::VRDisplayCapabilities::hasPosition const):
(WebCore::VRDisplayCapabilities::hasOrientation const):
(WebCore::VRDisplayCapabilities::hasExternalDisplay const):
(WebCore::VRDisplayCapabilities::canPresent const):

• platform/vr/VRPlatformDisplay.h:
• platform/vr/openvr/VRPlatformDisplayOpenVR.cpp:

(WebCore::VRPlatformDisplayOpenVR::VRPlatformDisplayOpenVR):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webvr/VRDisplayCapabilities.h (modified) (1 diff)
• platform/vr/VRPlatformDisplay.h (modified) (1 diff)
• platform/vr/openvr/VRPlatformDisplayOpenVR.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-10  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed build fix.
+
+        Those enum value names were too generic and would cause conflicts.
+
+        * Modules/webvr/VRDisplayCapabilities.h:
+        (WebCore::VRDisplayCapabilities::hasPosition const):
+        (WebCore::VRDisplayCapabilities::hasOrientation const):
+        (WebCore::VRDisplayCapabilities::hasExternalDisplay const):
+        (WebCore::VRDisplayCapabilities::canPresent const):
+        * platform/vr/VRPlatformDisplay.h:
+        * platform/vr/openvr/VRPlatformDisplayOpenVR.cpp:
+        (WebCore::VRPlatformDisplayOpenVR::VRPlatformDisplayOpenVR):
+
 2018-04-10  Chris Dumez  <cdumez@apple.com>
 

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

@@ -40 +40 @@
     }
 
-    bool hasPosition() const { return m_flags & VRDisplayCapabilityFlag::Position; }
-    bool hasOrientation() const { return m_flags & VRDisplayCapabilityFlag::Orientation; }
-    bool hasExternalDisplay() const { return m_flags & VRDisplayCapabilityFlag::ExternalDisplay; }
-    bool canPresent() const { return m_flags & VRDisplayCapabilityFlag::Present; }
+    bool hasPosition() const { return m_flags & VRDisplayCapabilityFlagPosition; }
+    bool hasOrientation() const { return m_flags & VRDisplayCapabilityFlagOrientation; }
+    bool hasExternalDisplay() const { return m_flags & VRDisplayCapabilityFlagExternalDisplay; }
+    bool canPresent() const { return m_flags & VRDisplayCapabilityFlagPresent; }
     unsigned maxLayer() const { return canPresent() ? 1 : 0; }
 

trunk/Source/WebCore/platform/vr/VRPlatformDisplay.h

@@ -32 +32 @@
 
 enum VRDisplayCapabilityFlag {
-    None = 0,
-    Position = 1 << 1,
-    Orientation = 1 << 2,
-    ExternalDisplay = 1 << 3,
-    Present = 1 << 4
+    VRDisplayCapabilityFlagNone = 0,
+    VRDisplayCapabilityFlagPosition = 1 << 1,
+    VRDisplayCapabilityFlagOrientation = 1 << 2,
+    VRDisplayCapabilityFlagExternalDisplay = 1 << 3,
+    VRDisplayCapabilityFlagPresent = 1 << 4
 };
 

trunk/Source/WebCore/platform/vr/openvr/VRPlatformDisplayOpenVR.cpp

@@ -49 +49 @@
     m_displayInfo.setIsMounted(false);
     // FIXME: We're assuming an HTC Vive HMD here. Get this info from OpenVR?.
-    m_displayInfo.setCapabilityFlags(VRDisplayCapabilityFlag::None | VRDisplayCapabilityFlag::Position | VRDisplayCapabilityFlag::Orientation | VRDisplayCapabilityFlag::ExternalDisplay | VRDisplayCapabilityFlag::Present);
+    m_displayInfo.setCapabilityFlags(VRDisplayCapabilityFlagNone | VRDisplayCapabilityFlagPosition | VRDisplayCapabilityFlagOrientation | VRDisplayCapabilityFlagExternalDisplay | VRDisplayCapabilityFlagPresent);
 
     m_compositor->SetTrackingSpace(vr::TrackingUniverseSeated);