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

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

Issue 359413005: Revert of Disable speech synthesis API for content/ layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 | content/browser/renderer_host/render_process_host_impl.cc » ('j') | 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/gpu_memory_buffer_factory_impl.h" 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Fullscreen video with subtitle is not yet supported. 71 // Fullscreen video with subtitle is not yet supported.
72 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle); 72 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle);
73 73
74 #if defined(VIDEO_HOLE) 74 #if defined(VIDEO_HOLE)
75 // Support EME/L1 with hole-punching. 75 // Support EME/L1 with hole-punching.
76 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 76 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
77 #endif 77 #endif
78 78
79 // WebRTC hardware decoding is not supported, internal bug 15075307 79 // WebRTC hardware decoding is not supported, internal bug 15075307
80 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding); 80 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
81
82 // Speech Synthesis backend resides in the chrome layer, not used by WebView.
83 // http://crbug.com/347045 tracks moving the backend to the content layer.
84 cl->AppendSwitch(switches::kDisableSpeechSynthesis);
85 return false; 81 return false;
86 } 82 }
87 83
88 void AwMainDelegate::PreSandboxStartup() { 84 void AwMainDelegate::PreSandboxStartup() {
89 // TODO(torne): When we have a separate renderer process, we need to handle 85 // TODO(torne): When we have a separate renderer process, we need to handle
90 // being passed open FDs for the resource paks here. 86 // being passed open FDs for the resource paks here.
91 #if defined(ARCH_CPU_ARM_FAMILY) 87 #if defined(ARCH_CPU_ARM_FAMILY)
92 // Create an instance of the CPU class to parse /proc/cpuinfo and cache 88 // Create an instance of the CPU class to parse /proc/cpuinfo and cache
93 // cpu_brand info. 89 // cpu_brand info.
94 base::CPU cpu_info; 90 base::CPU cpu_info;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 150
155 #if defined(VIDEO_HOLE) 151 #if defined(VIDEO_HOLE)
156 content::ExternalVideoSurfaceContainer* 152 content::ExternalVideoSurfaceContainer*
157 AwMainDelegate::CreateExternalVideoSurfaceContainer( 153 AwMainDelegate::CreateExternalVideoSurfaceContainer(
158 content::WebContents* web_contents) { 154 content::WebContents* web_contents) {
159 return new ExternalVideoSurfaceContainerImpl(web_contents); 155 return new ExternalVideoSurfaceContainerImpl(web_contents);
160 } 156 }
161 #endif 157 #endif
162 158
163 } // namespace android_webview 159 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698