Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crashes on video playback in UWP #27530

Merged
merged 2 commits into from Aug 6, 2020
Merged

Fix crashes on video playback in UWP #27530

merged 2 commits into from Aug 6, 2020

Conversation

jdm
Copy link
Member

@jdm jdm commented Aug 6, 2020

@highfive
Copy link

highfive commented Aug 6, 2020

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/mediasession.rs
  • @KiChjang: components/script/dom/mediasession.rs

@highfive
Copy link

highfive commented Aug 6, 2020

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!

@jdm
Copy link
Member Author

jdm commented Aug 6, 2020

r? @Manishearth

@highfive highfive assigned Manishearth and unassigned asajeffrey Aug 6, 2020
@@ -87,6 +87,8 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\aarch64-uwp-windows-msvc\debug\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(ProjectDir)\..\..\..\target\x86_64-uwp-windows-msvc\debug\</AdditionalIncludeDirectories>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">stdcpplatest</LanguageStandard>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpplatest</LanguageStandard>
Copy link
Member Author

@jdm jdm Aug 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes allow using the named struct initialization in Servo.cpp.

@Manishearth
Copy link
Member

Manishearth commented Aug 6, 2020

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2020

📌 Commit 5de6074 has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2020

Testing commit 5de6074 with merge 27e0db8...

bors-servo added a commit that referenced this issue Aug 6, 2020
Fix crashes on video playback in UWP

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #27529 and fix #27526
- [x] These changes do not require tests because there's no way to test UWP right now.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2020

💔 Test failed - status-taskcluster

@jdm
Copy link
Member Author

jdm commented Aug 6, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2020

Testing commit 5de6074 with merge 776b564...

@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2020

☀️ Test successful - status-taskcluster
Approved by: Manishearth
Pushing 776b564 to master...

@bors-servo bors-servo merged commit 776b564 into servo:master Aug 6, 2020
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants