Merge ~justinmcp/oxide:1603729 into oxide:master

Proposed by Justin McPherson
Status: Merged
Approved by: Chris Coulson
Approved revision: b340cd77c22d0173270c3b21ec92e52bc65d11c3
Merge reported by: Chris Coulson
Merged at revision: not available
Proposed branch: ~justinmcp/oxide:1603729
Merge into: oxide:master
Diff against target: 95 lines (+6/-14)
3 files modified
shared/renderer/media/oxide_media_info_loader.cc (+2/-2)
shared/renderer/media/oxide_web_media_player.cc (+2/-6)
shared/renderer/media/oxide_web_media_player.h (+2/-6)
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+314303@code.staging.launchpad.net

Commit message

   Fix in relation to 1603729.

    - Fix build
    - Make sure to set request type, otherwise a security error will be triggered.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

I haven't tested the context update update, it looks sound though.

As far as the MH build issues, this PR also adresses some build issues that might be due to recent updates upstream

https://code.launchpad.net/~abreu-alexandre/oxide/+git/oxide/+merge/314426

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

one small question inline

Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches