<!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>[278750] trunk</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/278750">278750</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2021-06-10 20:00:58 -0700 (Thu, 10 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Nothing is keeping navigator.xr alive during GC
https://bugs.webkit.org/show_bug.cgi?id=226898

Reviewed by Chris Dumez.

Source/WebCore:

Ensure the navigator.xr wrapper is kept alive when it has custom properties
by annotating it with `GenerateIsReachable=ReachableFromNavigator`.

Test: webxr/gc.html

* Modules/webxr/NavigatorWebXR.cpp:
(WebCore::NavigatorWebXR::xr):
* Modules/webxr/WebXRSystem.cpp:
(WebCore::WebXRSystem::create):
(WebCore::WebXRSystem::WebXRSystem):
(WebCore::WebXRSystem::navigator):
* Modules/webxr/WebXRSystem.h:
* Modules/webxr/WebXRSystem.idl:

LayoutTests:

Add test that ensure the navigator.xr wrapper is kept alive when it has
custom properties.

* webxr: Added.
* webxr/gc-expected.txt: Added.
* webxr/gc.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebxrNavigatorWebXRcpp">trunk/Source/WebCore/Modules/webxr/NavigatorWebXR.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebxrWebXRSystemcpp">trunk/Source/WebCore/Modules/webxr/WebXRSystem.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebxrWebXRSystemh">trunk/Source/WebCore/Modules/webxr/WebXRSystem.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebxrWebXRSystemidl">trunk/Source/WebCore/Modules/webxr/WebXRSystem.idl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/webxr/</li>
<li><a href="#trunkLayoutTestswebxrgcexpectedtxt">trunk/LayoutTests/webxr/gc-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebxrgchtml">trunk/LayoutTests/webxr/gc.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/LayoutTests/ChangeLog 2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-10  Sam Weinig  <weinig@apple.com>
+
+        Nothing is keeping navigator.xr alive during GC
+        https://bugs.webkit.org/show_bug.cgi?id=226898
+
+        Reviewed by Chris Dumez.
+
+        Add test that ensure the navigator.xr wrapper is kept alive when it has
+        custom properties. 
+
+        * webxr: Added.
+        * webxr/gc-expected.txt: Added.
+        * webxr/gc.html: Added.
+
</ins><span class="cx"> 2021-06-10  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Live Text] Add a mechanism to regenerate text in an image element when it changes dimensions
</span></span></pre></div>
<a id="trunkLayoutTestswebxrgcexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webxr/gc-expected.txt (0 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webxr/gc-expected.txt                          (rev 0)
+++ trunk/LayoutTests/webxr/gc-expected.txt     2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test that the window.navigator.xr wrapper preserves custom properties.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.navigator.xr.customProperty is undefined.
+window.navigator.xr.customProperty = 1
+PASS window.navigator.xr.customProperty is 1
+PASS window.navigator.xr.customProperty is 1
+PASS window.navigator.xr.customProperty is 1
+PASS window.navigator.xr.customProperty is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebxrgchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webxr/gc.html (0 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webxr/gc.html                          (rev 0)
+++ trunk/LayoutTests/webxr/gc.html     2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/js-test.js"></script>
+</head>
+<body>
+<script>
+
+description("Test that the window.navigator.xr wrapper preserves custom properties.");
+jsTestIsAsync = true;
+
+shouldBeUndefined("window.navigator.xr.customProperty");
+evalAndLog("window.navigator.xr.customProperty = 1");
+shouldBe("window.navigator.xr.customProperty", "1");
+gc();
+shouldBe("window.navigator.xr.customProperty", "1");
+
+onload = function() {
+    gc();
+    shouldBe("window.navigator.xr.customProperty", "1");
+    setTimeout(checkAndFinish, 0);
+}
+
+function checkAndFinish() {
+    gc();
+    shouldBe("window.navigator.xr.customProperty", "1");
+    finishJSTest();
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/Source/WebCore/ChangeLog      2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-06-10  Sam Weinig  <weinig@apple.com>
+
+        Nothing is keeping navigator.xr alive during GC
+        https://bugs.webkit.org/show_bug.cgi?id=226898
+
+        Reviewed by Chris Dumez.
+
+        Ensure the navigator.xr wrapper is kept alive when it has custom properties
+        by annotating it with `GenerateIsReachable=ReachableFromNavigator`. 
+
+        Test: webxr/gc.html
+
+        * Modules/webxr/NavigatorWebXR.cpp:
+        (WebCore::NavigatorWebXR::xr):
+        * Modules/webxr/WebXRSystem.cpp:
+        (WebCore::WebXRSystem::create):
+        (WebCore::WebXRSystem::WebXRSystem):
+        (WebCore::WebXRSystem::navigator):
+        * Modules/webxr/WebXRSystem.h:
+        * Modules/webxr/WebXRSystem.idl:
+
</ins><span class="cx"> 2021-06-10  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Drop unnecessary call to StringView::toStringWithoutCopying() in shouldTreatAsPotentiallyTrustworthy()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebxrNavigatorWebXRcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webxr/NavigatorWebXR.cpp (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webxr/NavigatorWebXR.cpp    2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/Source/WebCore/Modules/webxr/NavigatorWebXR.cpp       2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> {
</span><span class="cx">     auto& navigator = NavigatorWebXR::from(navigatorObject);
</span><span class="cx">     if (!navigator.m_xr)
</span><del>-        navigator.m_xr = WebXRSystem::create(*navigatorObject.scriptExecutionContext());
</del><ins>+        navigator.m_xr = WebXRSystem::create(navigatorObject);
</ins><span class="cx">     return *navigator.m_xr;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebxrWebXRSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webxr/WebXRSystem.cpp (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webxr/WebXRSystem.cpp       2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSystem.cpp  2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "IDLTypes.h"
</span><span class="cx"> #include "JSWebXRSession.h"
</span><span class="cx"> #include "JSXRReferenceSpaceType.h"
</span><ins>+#include "Navigator.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PlatformXR.h"
</span><span class="cx"> #include "RequestAnimationFrameCallback.h"
</span><span class="lines">@@ -53,14 +54,15 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(WebXRSystem);
</span><span class="cx"> 
</span><del>-Ref<WebXRSystem> WebXRSystem::create(ScriptExecutionContext& scriptExecutionContext)
</del><ins>+Ref<WebXRSystem> WebXRSystem::create(Navigator& navigator)
</ins><span class="cx"> {
</span><del>-    return adoptRef(*new WebXRSystem(scriptExecutionContext));
</del><ins>+    return adoptRef(*new WebXRSystem(navigator));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-WebXRSystem::WebXRSystem(ScriptExecutionContext& scriptExecutionContext)
-    : ActiveDOMObject(&scriptExecutionContext)
-    , m_defaultInlineDevice(scriptExecutionContext)
</del><ins>+WebXRSystem::WebXRSystem(Navigator& navigator)
+    : ActiveDOMObject(navigator.scriptExecutionContext())
+    , m_navigator(makeWeakPtr(navigator))
+    , m_defaultInlineDevice(*navigator.scriptExecutionContext())
</ins><span class="cx"> {
</span><span class="cx">     m_inlineXRDevice = makeWeakPtr(m_defaultInlineDevice);
</span><span class="cx">     suspendIfNeeded();
</span><span class="lines">@@ -68,6 +70,11 @@
</span><span class="cx"> 
</span><span class="cx"> WebXRSystem::~WebXRSystem() = default;
</span><span class="cx"> 
</span><ins>+Navigator* WebXRSystem::navigator()
+{
+    return m_navigator.get();
+}
+
</ins><span class="cx"> // https://immersive-web.github.io/webxr/#ensures-an-immersive-xr-device-is-selected
</span><span class="cx"> void WebXRSystem::ensureImmersiveXRDeviceIsSelected(CompletionHandler<void()>&& callback)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebxrWebXRSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webxr/WebXRSystem.h (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webxr/WebXRSystem.h 2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSystem.h    2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class DOMWindow;
</span><ins>+class Navigator;
</ins><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class WebXRSession;
</span><span class="cx"> struct XRSessionInit;
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx">     using IsSessionSupportedPromise = DOMPromiseDeferred<IDLBoolean>;
</span><span class="cx">     using RequestSessionPromise = DOMPromiseDeferred<IDLInterface<WebXRSession>>;
</span><span class="cx"> 
</span><del>-    static Ref<WebXRSystem> create(ScriptExecutionContext&);
</del><ins>+    static Ref<WebXRSystem> create(Navigator&);
</ins><span class="cx">     ~WebXRSystem();
</span><span class="cx"> 
</span><span class="cx">     using RefCounted<WebXRSystem>::ref;
</span><span class="lines">@@ -77,6 +78,8 @@
</span><span class="cx">     WEBCORE_EXPORT void registerSimulatedXRDeviceForTesting(PlatformXR::Device&);
</span><span class="cx">     WEBCORE_EXPORT void unregisterSimulatedXRDeviceForTesting(PlatformXR::Device&);
</span><span class="cx"> 
</span><ins>+    Navigator* navigator();
+
</ins><span class="cx"> protected:
</span><span class="cx">     // EventTarget
</span><span class="cx">     EventTargetInterface eventTargetInterface() const override { return WebXRSystemEventTargetInterfaceType; }
</span><span class="lines">@@ -89,7 +92,7 @@
</span><span class="cx">     void stop() override;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    WebXRSystem(ScriptExecutionContext&);
</del><ins>+    WebXRSystem(Navigator&);
</ins><span class="cx"> 
</span><span class="cx">     using FeatureList = PlatformXR::Device::FeatureList;
</span><span class="cx">     using JSFeatureList = Vector<JSC::JSValue>;
</span><span class="lines">@@ -117,6 +120,8 @@
</span><span class="cx">         std::optional<PlatformXR::LayerHandle> createLayerProjection(uint32_t, uint32_t, bool) final { return std::nullopt; }
</span><span class="cx">         void deleteLayer(PlatformXR::LayerHandle) final { }
</span><span class="cx">     };
</span><ins>+
+    WeakPtr<Navigator> m_navigator;
</ins><span class="cx">     DummyInlineDevice m_defaultInlineDevice;
</span><span class="cx"> 
</span><span class="cx">     bool m_immersiveXRDevicesHaveBeenEnumerated { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebxrWebXRSystemidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webxr/WebXRSystem.idl (278749 => 278750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webxr/WebXRSystem.idl       2021-06-11 02:56:28 UTC (rev 278749)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSystem.idl  2021-06-11 03:00:58 UTC (rev 278750)
</span><span class="lines">@@ -24,12 +24,13 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> [
</span><ins>+    ActiveDOMObject,
+    Conditional=WEBXR,
</ins><span class="cx">     EnabledBySetting=WebXR,
</span><del>-    Conditional=WEBXR,
-    ActiveDOMObject,
-    SecureContext,
</del><span class="cx">     Exposed=Window,
</span><del>-    InterfaceName=XRSystem
</del><ins>+    GenerateIsReachable=ReachableFromNavigator,
+    InterfaceName=XRSystem,
+    SecureContext
</ins><span class="cx"> ] interface WebXRSystem : EventTarget {
</span><span class="cx">     // Methods
</span><span class="cx">     Promise<undefined> isSessionSupported(XRSessionMode mode);
</span></span></pre>
</div>
</div>

</body>
</html>