Fire sessionavailable if in transient mode

servo · Jul 23, 2020 · b42d441 · b42d441
1 parent 5f31dbf
commit b42d441
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/support/hololens/ServoApp/ServoControl/Servo.cpp b/support/hololens/ServoApp/ServoControl/Servo.cpp
@@ -136,7 +136,7 @@ const char *prompt_input(const char *message, const char *default,
 
 Servo::Servo(std::optional<hstring> initUrl, hstring args, GLsizei width,
              GLsizei height, EGLNativeWindowType eglNativeWindow, float dpi,
-             ServoDelegate &aDelegate)
+             ServoDelegate &aDelegate, bool transient)
     : mWindowHeight(height), mWindowWidth(width), mDelegate(aDelegate) {
   ApplicationDataContainer localSettings =
       ApplicationData::Current().LocalSettings();
@@ -192,6 +192,14 @@ Servo::Servo(std::optional<hstring> initUrl, hstring args, GLsizei width,
 #endif
   }
 
+  if (transient) {
+    capi::CPref cpref;
+    cpref.key = "dom.webxr.sessionavailable";
+    cpref.pref_type = capi::CPrefType::Bool;
+    cpref.value = &transient;
+    cprefs.push_back(cpref);
+  }
+
   capi::CPrefList prefsList = {cprefs.size(), cprefs.data()};
 
   capi::CInitOptions o;

diff --git a/support/hololens/ServoApp/ServoControl/Servo.h b/support/hololens/ServoApp/ServoControl/Servo.h
@@ -28,7 +28,7 @@ class ServoDelegate;
 class Servo {
 public:
   Servo(std::optional<hstring>, hstring, GLsizei, GLsizei, EGLNativeWindowType,
-        float, ServoDelegate &);
+        float, ServoDelegate &, bool);
   ~Servo();
   ServoDelegate &Delegate() { return mDelegate; }
 

diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
@@ -407,7 +407,7 @@ void ServoControl::Loop() {
     ServoDelegate *sd = static_cast<ServoDelegate *>(this);
     EGLNativeWindowType win = GetNativeWindow();
     mServo = std::make_unique<Servo>(mInitUrl, mArgs, mPanelWidth, mPanelHeight,
-                                     win, mDPI, *sd);
+                                     win, mDPI, *sd, mTransient);
   } else {
     // FIXME: this will fail since create_task didn't pick the thread
     // where Servo was running initially.