Title: [230502] trunk/Source/WebCore
Revision
230502
Author
cdu...@apple.com
Date
2018-04-10 16:38:29 -0700 (Tue, 10 Apr 2018)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230501 => 230502)


--- trunk/Source/WebCore/ChangeLog	2018-04-10 23:34:42 UTC (rev 230501)
+++ trunk/Source/WebCore/ChangeLog	2018-04-10 23:38:29 UTC (rev 230502)
@@ -1,5 +1,20 @@
 2018-04-10  Chris Dumez  <cdu...@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  <cdu...@apple.com>
+
         Avoid constructing a service worker RegistrationStore for private sessions
         https://bugs.webkit.org/show_bug.cgi?id=184463
         <rdar://problem/36613948>

Modified: trunk/Source/WebCore/Modules/webvr/VRDisplayCapabilities.h (230501 => 230502)


--- trunk/Source/WebCore/Modules/webvr/VRDisplayCapabilities.h	2018-04-10 23:34:42 UTC (rev 230501)
+++ trunk/Source/WebCore/Modules/webvr/VRDisplayCapabilities.h	2018-04-10 23:38:29 UTC (rev 230502)
@@ -39,10 +39,10 @@
         return adoptRef(*new VRDisplayCapabilities(capabilityFlags));
     }
 
-    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; }
 
 private:

Modified: trunk/Source/WebCore/platform/vr/VRPlatformDisplay.h (230501 => 230502)


--- trunk/Source/WebCore/platform/vr/VRPlatformDisplay.h	2018-04-10 23:34:42 UTC (rev 230501)
+++ trunk/Source/WebCore/platform/vr/VRPlatformDisplay.h	2018-04-10 23:38:29 UTC (rev 230502)
@@ -31,11 +31,11 @@
 typedef unsigned VRDisplayCapabilityFlags;
 
 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
 };
 
 /* The purpose of this class is to encapsulate all the info about the display in a single class/data

Modified: trunk/Source/WebCore/platform/vr/openvr/VRPlatformDisplayOpenVR.cpp (230501 => 230502)


--- trunk/Source/WebCore/platform/vr/openvr/VRPlatformDisplayOpenVR.cpp	2018-04-10 23:34:42 UTC (rev 230501)
+++ trunk/Source/WebCore/platform/vr/openvr/VRPlatformDisplayOpenVR.cpp	2018-04-10 23:38:29 UTC (rev 230502)
@@ -48,7 +48,7 @@
     m_displayInfo.setDisplayName(stringBuilder.toString());
     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);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to