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

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

Issue 287993004: [Android WebView] Implement Ubercomp for Render Thread support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 6 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 | Annotate | Revision Log
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"
11 #include "android_webview/common/aw_switches.h"
11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
12 #include "android_webview/native/aw_geolocation_permission_context.h" 13 #include "android_webview/native/aw_geolocation_permission_context.h"
13 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 14 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
14 #include "android_webview/native/aw_web_contents_view_delegate.h" 15 #include "android_webview/native/aw_web_contents_view_delegate.h"
15 #include "android_webview/native/aw_web_preferences_populater_impl.h" 16 #include "android_webview/native/aw_web_preferences_populater_impl.h"
16 #include "android_webview/native/external_video_surface_container_impl.h" 17 #include "android_webview/native/external_video_surface_container_impl.h"
17 #include "android_webview/renderer/aw_content_renderer_client.h" 18 #include "android_webview/renderer/aw_content_renderer_client.h"
18 #include "base/command_line.h" 19 #include "base/command_line.h"
19 #include "base/cpu.h" 20 #include "base/cpu.h"
20 #include "base/lazy_instance.h" 21 #include "base/lazy_instance.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 cl->AppendSwitch(switches::kEnableBeginFrameScheduling); 60 cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
60 cl->AppendSwitch(switches::kEnableZeroCopy); 61 cl->AppendSwitch(switches::kEnableZeroCopy);
61 cl->AppendSwitch(switches::kEnableImplSidePainting); 62 cl->AppendSwitch(switches::kEnableImplSidePainting);
62 63
63 // WebView uses the Android system's scrollbars and overscroll glow. 64 // WebView uses the Android system's scrollbars and overscroll glow.
64 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); 65 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
65 66
66 // Not yet supported in single-process mode. 67 // Not yet supported in single-process mode.
67 cl->AppendSwitch(switches::kDisableSharedWorkers); 68 cl->AppendSwitch(switches::kDisableSharedWorkers);
68 69
70 if (!switches::UbercompEnabled()) {
71 cl->AppendSwitch(switches::kDisableDelegatedRenderer);
72 } else {
73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
74 cl->AppendSwitch(switches::kDisableExperimentalWebGL);
75 }
69 76
70 // File system API not supported (requires some new API; internal bug 6930981) 77 // File system API not supported (requires some new API; internal bug 6930981)
71 cl->AppendSwitch(switches::kDisableFileSystem); 78 cl->AppendSwitch(switches::kDisableFileSystem);
72 79
73 // Fullscreen video with subtitle is not yet supported. 80 // Fullscreen video with subtitle is not yet supported.
74 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle); 81 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle);
75 82
76 #if defined(VIDEO_HOLE) 83 #if defined(VIDEO_HOLE)
77 // Support EME/L1 with hole-punching. 84 // Support EME/L1 with hole-punching.
78 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 85 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 162
156 #if defined(VIDEO_HOLE) 163 #if defined(VIDEO_HOLE)
157 content::ExternalVideoSurfaceContainer* 164 content::ExternalVideoSurfaceContainer*
158 AwMainDelegate::CreateExternalVideoSurfaceContainer( 165 AwMainDelegate::CreateExternalVideoSurfaceContainer(
159 content::WebContents* web_contents) { 166 content::WebContents* web_contents) {
160 return new ExternalVideoSurfaceContainerImpl(web_contents); 167 return new ExternalVideoSurfaceContainerImpl(web_contents);
161 } 168 }
162 #endif 169 #endif
163 170
164 } // namespace android_webview 171 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698