commit | 97c6e1439c14a751066aa49f3705288a94d9eaf5 | [log] [tgz] |
---|---|---|
author | yucliu <[email protected]> | Tue Sep 26 18:12:21 2017 |
committer | Xiaohan Wang <[email protected]> | Tue Sep 26 18:12:21 2017 |
tree | a8825642a0aef528b19f1133bc4359d435d45244 | |
parent | 8fc63daaae9819efd5d1cc89c6b5d93f552f4f34 [diff] |
[Clank] Handle MediaDrm provision failure safely in offline. In offline, MediaDrm provision will fail because browser can't send provision request. This will return a null MediaCrypto object to VDA. This patch: 1. Return empty String from Java, instead of null when calling getSecurityLevel. 2. Make OnMediaCryptoCB always return a valid std::unique_ptr<JavaRef> of MediaCrypto. Client is expected to check if JavaRef contains a null object instead of checking if std::unique_ptr contains a null JavaRef. 3. AVDA::SetOverlayInfo early returns if in ERROR state. BUG=762192 TEST=repro step in the bug (cherry picked from commit 6d3ff1b5140b29039d931f5ee95466b1782cb142) Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: Ie264e5a1d803fd4d2afbbdabcac7d1b600e26f85 Reviewed-on: https://chromium-review.googlesource.com/669776 Reviewed-by: Frank Liberato <[email protected]> Reviewed-by: John Rummell <[email protected]> Reviewed-by: Xiaohan Wang <[email protected]> Commit-Queue: Yuchen Liu <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#502947} Reviewed-on: https://chromium-review.googlesource.com/683220 Cr-Commit-Position: refs/branch-heads/3202@{#451} Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .