Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26837 - servo:jdm-patch-44, r=Manishearth

Browse source 
Use the latest stable MixedReality runtime

Per Microsoft, the preview runtime is now stable and we can depend on it without hidden environment variables.
This commit is contained in:
bors-servo 2020-06-10 15:15:06 -04:00 • committed by GitHub
commit 31dab7c8ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
support/hololens/ServoApp/Package.appxmanifest
View file

@ -9,7 +9,7 @@
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
<PackageDependency Name="Microsoft.WindowsMixedReality.Runtime" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="100.2004.3007.0"/>
<PackageDependency Name="Microsoft.WindowsMixedReality.Runtime" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="102.2006.3006.0"/>
</Dependencies>
<Resources>
<Resource Language="x-generate" />

2
support/hololens/ServoApp/ServoControl/Servo.cpp
View file

@ -129,8 +129,6 @@ Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height,
EGLNativeWindowType eglNativeWindow, float dpi,
ServoDelegate &aDelegate)
: mWindowHeight(height), mWindowWidth(width), mDelegate(aDelegate) {
SetEnvironmentVariableA("PreviewRuntimeEnabled", "1");
Windows::Storage::ApplicationDataContainer localSettings =
Windows::Storage::ApplicationData::Current().LocalSettings();
if (!localSettings.Containers().HasKey(L"servoUserPrefs")) {