<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280681] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280681">280681</a></dd>
<dt>Author</dt> <dd>ifernandez@igalia.com</dd>
<dt>Date</dt> <dd>2021-08-05 00:40:52 -0700 (Thu, 05 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix XR related clang warnings in WPE
https://bugs.webkit.org/show_bug.cgi?id=228779

Reviewed by Sam Weinig.

Fix a few compiler warnings.

Source/WebCore:

* platform/xr/openxr/OpenXRInputSource.cpp:
(PlatformXR::OpenXRInputSource::getButton const):
* platform/xr/openxr/OpenXRSwapchain.cpp:
(PlatformXR::OpenXRSwapchain::create):
(PlatformXR::OpenXRSwapchain::OpenXRSwapchain):
(PlatformXR::OpenXRSwapchain::acquireImage):
* platform/xr/openxr/OpenXRSwapchain.h:

Source/WebKit:

* Shared/XR/XRDeviceProxy.cpp:
(WebKit::XRDeviceProxy::views const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformxropenxrOpenXRInputSourcecpp">trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformxropenxrOpenXRSwapchaincpp">trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformxropenxrOpenXRSwapchainh">trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedXRXRDeviceProxycpp">trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/ChangeLog      2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-08-05  Imanol Fernandez  <ifernandez@igalia.com>
+
+        Fix XR related clang warnings in WPE
+        https://bugs.webkit.org/show_bug.cgi?id=228779
+
+        Reviewed by Sam Weinig.
+
+        Fix a few compiler warnings.
+
+        * platform/xr/openxr/OpenXRInputSource.cpp:
+        (PlatformXR::OpenXRInputSource::getButton const):
+        * platform/xr/openxr/OpenXRSwapchain.cpp:
+        (PlatformXR::OpenXRSwapchain::create):
+        (PlatformXR::OpenXRSwapchain::OpenXRSwapchain):
+        (PlatformXR::OpenXRSwapchain::acquireImage):
+        * platform/xr/openxr/OpenXRSwapchain.h:
+
</ins><span class="cx"> 2021-08-04  Darin Adler  <darin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Change WebSocket.cpp to @no-unify, since it’s hard to do that for someone without a Mac
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformxropenxrOpenXRInputSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp    2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp       2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx">     auto& actions = it->value;
</span><span class="cx"> 
</span><span class="cx">     auto queryActionState = [this, &hasValue](XrAction action, auto& value, auto defaultValue) {
</span><del>-        if (action != XR_NULL_HANDLE && XR_SUCCEEDED(getActionState(action, &value)))
</del><ins>+        if (action != XR_NULL_HANDLE && XR_SUCCEEDED(this->getActionState(action, &value)))
</ins><span class="cx">             hasValue = true;
</span><span class="cx">         else
</span><span class="cx">             value = defaultValue;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformxropenxrOpenXRSwapchaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp      2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.cpp 2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -56,12 +56,11 @@
</span><span class="cx">     result = xrEnumerateSwapchainImages(swapchain, imageCount, &imageCount, imageHeaders[0]);
</span><span class="cx">     RETURN_IF_FAILED(result, "xrEnumerateSwapchainImages with imageCount", instance, nullptr);
</span><span class="cx"> 
</span><del>-    return std::unique_ptr<OpenXRSwapchain>(new OpenXRSwapchain(instance, session, swapchain, info, WTFMove(imageBuffers)));
</del><ins>+    return std::unique_ptr<OpenXRSwapchain>(new OpenXRSwapchain(instance, swapchain, info, WTFMove(imageBuffers)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-OpenXRSwapchain::OpenXRSwapchain(XrInstance instance, XrSession session, XrSwapchain swapchain, const XrSwapchainCreateInfo& info, Vector<XrSwapchainImageOpenGLKHR>&& imageBuffers)
</del><ins>+OpenXRSwapchain::OpenXRSwapchain(XrInstance instance, XrSwapchain swapchain, const XrSwapchainCreateInfo& info, Vector<XrSwapchainImageOpenGLKHR>&& imageBuffers)
</ins><span class="cx">     : m_instance(instance)
</span><del>-    , m_session(session)
</del><span class="cx">     , m_swapchain(swapchain)
</span><span class="cx">     , m_createInfo(info)
</span><span class="cx">     , m_imageBuffers(WTFMove(imageBuffers))
</span><span class="lines">@@ -78,6 +77,10 @@
</span><span class="cx"> 
</span><span class="cx"> std::optional<PlatformGLObject> OpenXRSwapchain::acquireImage()
</span><span class="cx"> {
</span><ins>+#if LOG_DISABLED
+    UNUSED_VARIABLE(m_instance);
+#endif
+
</ins><span class="cx">     RELEASE_ASSERT_WITH_MESSAGE(!m_acquiredTexture , "Expected no acquired images. ReleaseImage not called?");
</span><span class="cx"> 
</span><span class="cx">     auto acquireInfo = createStructure<XrSwapchainImageAcquireInfo, XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO>();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformxropenxrOpenXRSwapchainh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h        2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebCore/platform/xr/openxr/OpenXRSwapchain.h   2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -43,10 +43,9 @@
</span><span class="cx">     int32_t height() const { return m_createInfo.height; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    OpenXRSwapchain(XrInstance, XrSession, XrSwapchain, const XrSwapchainCreateInfo&, Vector<XrSwapchainImageOpenGLKHR>&&);
</del><ins>+    OpenXRSwapchain(XrInstance, XrSwapchain, const XrSwapchainCreateInfo&, Vector<XrSwapchainImageOpenGLKHR>&&);
</ins><span class="cx"> 
</span><span class="cx">     XrInstance m_instance;
</span><del>-    XrSession m_session;
</del><span class="cx">     XrSwapchain m_swapchain;
</span><span class="cx">     XrSwapchainCreateInfo m_createInfo;
</span><span class="cx">     Vector<XrSwapchainImageOpenGLKHR> m_imageBuffers;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebKit/ChangeLog       2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-08-05  Imanol Fernandez  <ifernandez@igalia.com>
+
+        Fix XR related clang warnings in WPE
+        https://bugs.webkit.org/show_bug.cgi?id=228779
+
+        Reviewed by Sam Weinig.
+
+        Fix a few compiler warnings.
+
+        * Shared/XR/XRDeviceProxy.cpp:
+        (WebKit::XRDeviceProxy::views const):
+
</ins><span class="cx"> 2021-08-04  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Bifurcated RemoteLayerBackingStore zooms in every time it repaints
</span></span></pre></div>
<a id="trunkSourceWebKitSharedXRXRDeviceProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp (280680 => 280681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp  2021-08-05 03:31:15 UTC (rev 280680)
+++ trunk/Source/WebKit/Shared/XR/XRDeviceProxy.cpp     2021-08-05 07:40:52 UTC (rev 280681)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx"> {
</span><span class="cx">     Vector<Device::ViewData> views;
</span><span class="cx">     if (m_supportsStereoRendering && mode == SessionMode::ImmersiveVr) {
</span><del>-        views.append({ .active = true, Eye::Left });
-        views.append({ .active = true, Eye::Right });
</del><ins>+        views.append({ .active = true, .eye = Eye::Left });
+        views.append({ .active = true, .eye = Eye::Right });
</ins><span class="cx">     } else
</span><del>-        views.append({ .active = true, Eye::None });
</del><ins>+        views.append({ .active = true, .eye = Eye::None });
</ins><span class="cx">     return views;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>