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

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

Issue 1997783002: Revert "Flip unified media pipeline to default-on w/ disabled holdback." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 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 | chrome/app/generated_resources.grd » ('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 <memory> 7 #include <memory>
8 8
9 #include "android_webview/browser/aw_content_browser_client.h" 9 #include "android_webview/browser/aw_content_browser_client.h"
10 #include "android_webview/browser/browser_view_renderer.h" 10 #include "android_webview/browser/browser_view_renderer.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 kV8SnapshotDataDescriptor64, 133 kV8SnapshotDataDescriptor64,
134 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe()); 134 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe());
135 } 135 }
136 136
137 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) { 137 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) {
138 cl->AppendSwitch(switches::kInProcessGPU); 138 cl->AppendSwitch(switches::kInProcessGPU);
139 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1"); 139 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
140 cl->AppendSwitch(switches::kDisableRendererBackgrounding); 140 cl->AppendSwitch(switches::kDisableRendererBackgrounding);
141 } 141 }
142 142
143 // TODO(liberato, watk): Reenable after resolving fullscreen test failures.
144 // See http://crbug.com/597495
145 cl->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
146
147 return false; 143 return false;
148 } 144 }
149 145
150 void AwMainDelegate::PreSandboxStartup() { 146 void AwMainDelegate::PreSandboxStartup() {
151 #if defined(ARCH_CPU_ARM_FAMILY) 147 #if defined(ARCH_CPU_ARM_FAMILY)
152 // Create an instance of the CPU class to parse /proc/cpuinfo and cache 148 // Create an instance of the CPU class to parse /proc/cpuinfo and cache
153 // cpu_brand info. 149 // cpu_brand info.
154 base::CPU cpu_info; 150 base::CPU cpu_info;
155 #endif 151 #endif
156 152
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 #if defined(VIDEO_HOLE) 249 #if defined(VIDEO_HOLE)
254 content::ExternalVideoSurfaceContainer* 250 content::ExternalVideoSurfaceContainer*
255 AwMainDelegate::CreateExternalVideoSurfaceContainer( 251 AwMainDelegate::CreateExternalVideoSurfaceContainer(
256 content::WebContents* web_contents) { 252 content::WebContents* web_contents) {
257 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( 253 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
258 web_contents); 254 web_contents);
259 } 255 }
260 #endif 256 #endif
261 257
262 } // namespace android_webview 258 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698