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

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

Issue 2083673002: [NOT FOR COMMIT] multiple_renderer Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 5 Created 4 years, 6 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 | « android_webview/apk/java/AndroidManifest.xml ('k') | 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 <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
130 base::android::RegisterApkAssetWithGlobalDescriptors( 130 base::android::RegisterApkAssetWithGlobalDescriptors(
131 kV8NativesDataDescriptor64, 131 kV8NativesDataDescriptor64,
132 gin::V8Initializer::GetNativesFilePath(false).AsUTF8Unsafe()); 132 gin::V8Initializer::GetNativesFilePath(false).AsUTF8Unsafe());
133 base::android::RegisterApkAssetWithGlobalDescriptors( 133 base::android::RegisterApkAssetWithGlobalDescriptors(
134 kV8SnapshotDataDescriptor64, 134 kV8SnapshotDataDescriptor64,
135 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe()); 135 gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe());
136 } 136 }
137 137
138 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) { 138 if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) {
139 cl->AppendSwitch(switches::kInProcessGPU); 139 cl->AppendSwitch(switches::kInProcessGPU);
140 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1"); 140 cl->AppendSwitchASCII(switches::kRendererProcessLimit, "5");
141 cl->AppendSwitch(switches::kDisableRendererBackgrounding); 141 cl->AppendSwitch(switches::kDisableRendererBackgrounding);
142 } 142 }
143 143
144 // TODO(liberato, watk): Reenable after resolving fullscreen test failures. 144 // TODO(liberato, watk): Reenable after resolving fullscreen test failures.
145 // See http://crbug.com/597495 145 // See http://crbug.com/597495
146 cl->AppendSwitch(switches::kDisableUnifiedMediaPipeline); 146 cl->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
147 147
148 return false; 148 return false;
149 } 149 }
150 150
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 #if defined(VIDEO_HOLE) 267 #if defined(VIDEO_HOLE)
268 content::ExternalVideoSurfaceContainer* 268 content::ExternalVideoSurfaceContainer*
269 AwMainDelegate::CreateExternalVideoSurfaceContainer( 269 AwMainDelegate::CreateExternalVideoSurfaceContainer(
270 content::WebContents* web_contents) { 270 content::WebContents* web_contents) {
271 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( 271 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
272 web_contents); 272 web_contents);
273 } 273 }
274 #endif 274 #endif
275 275
276 } // namespace android_webview 276 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/apk/java/AndroidManifest.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698