Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 1130253007: Enable unprefixed EME in WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h" 10 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // Not yet supported in single-process mode. 71 // Not yet supported in single-process mode.
72 cl->AppendSwitch(switches::kDisableSharedWorkers); 72 cl->AppendSwitch(switches::kDisableSharedWorkers);
73 73
74 // File system API not supported (requires some new API; internal bug 6930981) 74 // File system API not supported (requires some new API; internal bug 6930981)
75 cl->AppendSwitch(switches::kDisableFileSystem); 75 cl->AppendSwitch(switches::kDisableFileSystem);
76 76
77 // Web Notification API and the Push API are not supported (crbug.com/434712) 77 // Web Notification API and the Push API are not supported (crbug.com/434712)
78 cl->AppendSwitch(switches::kDisableNotifications); 78 cl->AppendSwitch(switches::kDisableNotifications);
79 79
80 // TODO(ddorwin): Enable unprefixed EME. See http://crbug.com/394931.
81 cl->AppendSwitch(switches::kDisableEncryptedMedia);
82
83 // WebRTC hardware decoding is not supported, internal bug 15075307 80 // WebRTC hardware decoding is not supported, internal bug 15075307
84 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding); 81 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
85 cl->AppendSwitch(switches::kDisableAcceleratedVideoDecode); 82 cl->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
86 83
87 // This is needed for sharing textures across the different GL threads. 84 // This is needed for sharing textures across the different GL threads.
88 cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes); 85 cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes);
89 86
90 // WebView does not yet support screen orientation locking. 87 // WebView does not yet support screen orientation locking.
91 cl->AppendSwitch(switches::kDisableScreenOrientationLock); 88 cl->AppendSwitch(switches::kDisableScreenOrientationLock);
92 89
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 #if defined(VIDEO_HOLE) 196 #if defined(VIDEO_HOLE)
200 content::ExternalVideoSurfaceContainer* 197 content::ExternalVideoSurfaceContainer*
201 AwMainDelegate::CreateExternalVideoSurfaceContainer( 198 AwMainDelegate::CreateExternalVideoSurfaceContainer(
202 content::WebContents* web_contents) { 199 content::WebContents* web_contents) {
203 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( 200 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
204 web_contents); 201 web_contents);
205 } 202 }
206 #endif 203 #endif
207 204
208 } // namespace android_webview 205 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698