diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2016-03-11 13:14:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 21:16:34 +0000 |
| commit | 2ceccae6337cab6b6d5be02413c2b56ebaebca1b (patch) | |
| tree | 88f8e562d58bd94f61eae94025d02f9debd08c51 /android_webview/test | |
| parent | ec5d9a515fbff8e2898c26f4356ca1339d9eb987 (diff) | |
| download | chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.zip chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.tar.gz chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.tar.bz2 | |
Revert of Flip proprietary codecs to false for Android chromium builds. (patchset #11 id:220001 of https://codereview.chromium.org/1577433004/ )
Reason for revert:
Broke AndroidWebViewTest. See https://build.chromium.org/p/chromium.linux/builders/Android%20GN
Original issue's description:
> Flip proprietary codecs to false for Android chromium builds.
>
> Official builds still using branding=Chrome so they will continue
> to support codecs and containers like h264, mp3, aac, and mp4.
>
> Adds support for video/webm videos using vp8,vorbis to the webview
> tests so they will continue to work w/o proprietary codecs.
>
> We have approval to do this now. Summary will be posted to the
> src= launch bug: http://crbug.com/533190#c17
>
> This will require some changes to the build flags for the official
> WebView AOSP builders, which I'll land shortly after this.
>
> BUG=570762
> TEST=webview tests pass.
>
> Committed: https://crrev.com/43631fe1435e3c79467550b2cf797383d4cba8e6
> Cr-Commit-Position: refs/heads/master@{#380649}
TBR=boliu@chromium.org,ddorwin@chromium.org,dpranke@chromium.org,nyquist@chromium.org,dalecurtis@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=570762
Review URL: https://codereview.chromium.org/1785173005
Cr-Commit-Position: refs/heads/master@{#380731}
Diffstat (limited to 'android_webview/test')
| -rw-r--r-- | android_webview/test/BUILD.gn | 2 | ||||
| -rw-r--r-- | android_webview/test/shell/assets/full_screen_video_inside_div_test.html | 2 | ||||
| -rw-r--r-- | android_webview/test/shell/assets/full_screen_video_test.html | 2 | ||||
| -rw-r--r-- | android_webview/test/shell/assets/multiple_videos_test.html | 4 | ||||
| -rw-r--r-- | android_webview/test/shell/assets/video.mp4 | bin | 0 -> 41099 bytes | |||
| -rw-r--r-- | android_webview/test/shell/assets/video.webm | bin | 47832 -> 0 bytes |
6 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn index 68b71d4..92b46fa 100644 --- a/android_webview/test/BUILD.gn +++ b/android_webview/test/BUILD.gn @@ -65,7 +65,7 @@ android_assets("android_webview_apk_assets") { "shell/assets/full_screen_video_inside_div_test.html", "shell/assets/full_screen_video_test.html", "shell/assets/multiple_videos_test.html", - "shell/assets/video.webm", + "shell/assets/video.mp4", "shell/assets/visual_state_during_fullscreen_test.html", "shell/assets/visual_state_on_page_commit_visible_test.html", "shell/assets/visual_state_waits_for_js_detached_test.html", diff --git a/android_webview/test/shell/assets/full_screen_video_inside_div_test.html b/android_webview/test/shell/assets/full_screen_video_inside_div_test.html index f76d981..7a8f4f2 100644 --- a/android_webview/test/shell/assets/full_screen_video_inside_div_test.html +++ b/android_webview/test/shell/assets/full_screen_video_inside_div_test.html @@ -9,7 +9,7 @@ <div id='div'> <button id="playControl" style='padding:10px 10px;' onclick="playVideo(); return false">Play</button> <video style = 'width: 300px; height: 300px;' id='video'> - <source src="video.webm" type="video/webm"> + <source src="video.mp4" type="video/mp4"> </video> </div> </body> diff --git a/android_webview/test/shell/assets/full_screen_video_test.html b/android_webview/test/shell/assets/full_screen_video_test.html index 6d1979d..c046e70 100644 --- a/android_webview/test/shell/assets/full_screen_video_test.html +++ b/android_webview/test/shell/assets/full_screen_video_test.html @@ -9,7 +9,7 @@ <button id="fullscreenControl" autofocus style ='padding:10px 10px;' onclick="goFullscreen('video'); return false">Go fullscreen</button> <button id="playControl" style='padding:10px 10px;' onclick="playVideo(); return false">Play</button> <video style = 'width: 10px; height: 10px;' id='video' controls> - <source src="video.webm" type="video/webm"> + <source src="video.mp4" type="video/mp4"> </video> </body> </html> diff --git a/android_webview/test/shell/assets/multiple_videos_test.html b/android_webview/test/shell/assets/multiple_videos_test.html index 70c3945..12ded88 100644 --- a/android_webview/test/shell/assets/multiple_videos_test.html +++ b/android_webview/test/shell/assets/multiple_videos_test.html @@ -18,11 +18,11 @@ function playSecondVideo() { <button id="playSecondButton" style='padding:10px 10px;' onclick="playSecondVideo(); return false">Play second</button> <video style='width: 10px; height: 10px;' id='firstVideo' controls> - <source src="video.webm" type="video/webm"> + <source src="video.mp4" type="video/mp4"> </video> <video style='width: 10px; height: 10px;' id='secondVideo' controls> - <source src="video.webm" type="video/webm"> + <source src="video.mp4" type="video/mp4"> </video> </body> diff --git a/android_webview/test/shell/assets/video.mp4 b/android_webview/test/shell/assets/video.mp4 Binary files differnew file mode 100644 index 0000000..3763b59 --- /dev/null +++ b/android_webview/test/shell/assets/video.mp4 diff --git a/android_webview/test/shell/assets/video.webm b/android_webview/test/shell/assets/video.webm Binary files differdeleted file mode 100644 index 7bfc552..0000000 --- a/android_webview/test/shell/assets/video.webm +++ /dev/null |