| OLD | NEW |
| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 kV8SnapshotDataDescriptor64, | 130 kV8SnapshotDataDescriptor64, |
| 131 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe()); | 131 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe()); |
| 132 } | 132 } |
| 133 | 133 |
| 134 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) { | 134 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) { |
| 135 cl->AppendSwitch(switches::kInProcessGPU); | 135 cl->AppendSwitch(switches::kInProcessGPU); |
| 136 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1"); | 136 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1"); |
| 137 cl->AppendSwitch(switches::kDisableRendererBackgrounding); | 137 cl->AppendSwitch(switches::kDisableRendererBackgrounding); |
| 138 } | 138 } |
| 139 | 139 |
| 140 // TODO(liberato, watk): Reenable after resolving fullscreen test failures. | |
| 141 // See http://crbug.com/597495 | |
| 142 cl->AppendSwitch(switches::kDisableUnifiedMediaPipeline); | |
| 143 | |
| 144 return false; | 140 return false; |
| 145 } | 141 } |
| 146 | 142 |
| 147 void AwMainDelegate::PreSandboxStartup() { | 143 void AwMainDelegate::PreSandboxStartup() { |
| 148 #if defined(ARCH_CPU_ARM_FAMILY) | 144 #if defined(ARCH_CPU_ARM_FAMILY) |
| 149 // Create an instance of the CPU class to parse /proc/cpuinfo and cache | 145 // Create an instance of the CPU class to parse /proc/cpuinfo and cache |
| 150 // cpu_brand info. | 146 // cpu_brand info. |
| 151 base::CPU cpu_info; | 147 base::CPU cpu_info; |
| 152 #endif | 148 #endif |
| 153 | 149 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 #if defined(VIDEO_HOLE) | 259 #if defined(VIDEO_HOLE) |
| 264 content::ExternalVideoSurfaceContainer* | 260 content::ExternalVideoSurfaceContainer* |
| 265 AwMainDelegate::CreateExternalVideoSurfaceContainer( | 261 AwMainDelegate::CreateExternalVideoSurfaceContainer( |
| 266 content::WebContents* web_contents) { | 262 content::WebContents* web_contents) { |
| 267 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( | 263 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( |
| 268 web_contents); | 264 web_contents); |
| 269 } | 265 } |
| 270 #endif | 266 #endif |
| 271 | 267 |
| 272 } // namespace android_webview | 268 } // namespace android_webview |
| OLD | NEW |