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 "android_webview/browser/aw_content_browser_client.h" | 7 #include "android_webview/browser/aw_content_browser_client.h" |
8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" | 8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" |
9 #include "android_webview/browser/in_process_view_renderer.h" | 9 #include "android_webview/browser/in_process_view_renderer.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/common/aw_switches.h" |
12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" | 12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" |
13 #include "android_webview/native/aw_geolocation_permission_context.h" | 13 #include "android_webview/native/aw_geolocation_permission_context.h" |
14 #include "android_webview/native/aw_quota_manager_bridge_impl.h" | 14 #include "android_webview/native/aw_quota_manager_bridge_impl.h" |
15 #include "android_webview/native/aw_web_contents_view_delegate.h" | 15 #include "android_webview/native/aw_web_contents_view_delegate.h" |
16 #include "android_webview/native/aw_web_preferences_populater_impl.h" | 16 #include "android_webview/native/aw_web_preferences_populater_impl.h" |
17 #include "android_webview/renderer/aw_content_renderer_client.h" | 17 #include "android_webview/renderer/aw_content_renderer_client.h" |
18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
19 #include "base/lazy_instance.h" | 19 #include "base/lazy_instance.h" |
20 #include "base/logging.h" | 20 #include "base/logging.h" |
21 #include "base/memory/scoped_ptr.h" | 21 #include "base/memory/scoped_ptr.h" |
22 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
23 #include "cc/base/switches.h" | 23 #include "cc/base/switches.h" |
24 #include "content/public/browser/browser_main_runner.h" | 24 #include "content/public/browser/browser_main_runner.h" |
25 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
26 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
27 #include "gpu/command_buffer/client/gl_in_process_context.h" | 27 #include "gpu/command_buffer/client/gl_in_process_context.h" |
28 #include "gpu/command_buffer/service/in_process_command_buffer.h" | 28 #include "gpu/command_buffer/service/in_process_command_buffer.h" |
| 29 #include "media/base/media_switches.h" |
29 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" | 30 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" |
30 | 31 |
31 namespace android_webview { | 32 namespace android_webview { |
32 | 33 |
33 namespace { | 34 namespace { |
34 | 35 |
35 // TODO(boliu): Remove this global Allow once the underlying issues are | 36 // TODO(boliu): Remove this global Allow once the underlying issues are |
36 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. | 37 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. |
37 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > | 38 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > |
38 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; | 39 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 75 |
75 // File system API not supported (requires some new API; internal bug 6930981) | 76 // File system API not supported (requires some new API; internal bug 6930981) |
76 cl->AppendSwitch(switches::kDisableFileSystem); | 77 cl->AppendSwitch(switches::kDisableFileSystem); |
77 | 78 |
78 // Disable compositor touch hit testing for now to mitigate risk of bugs. | 79 // Disable compositor touch hit testing for now to mitigate risk of bugs. |
79 cl->AppendSwitch(cc::switches::kDisableCompositorTouchHitTesting); | 80 cl->AppendSwitch(cc::switches::kDisableCompositorTouchHitTesting); |
80 | 81 |
81 // Disable WebRTC. | 82 // Disable WebRTC. |
82 cl->AppendSwitch(switches::kDisableWebRTC); | 83 cl->AppendSwitch(switches::kDisableWebRTC); |
83 | 84 |
| 85 #if defined(VIDEO_HOLE) |
| 86 // Support EME/L1 with hole-punching. |
| 87 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); |
| 88 #endif |
| 89 |
84 return false; | 90 return false; |
85 } | 91 } |
86 | 92 |
87 void AwMainDelegate::PreSandboxStartup() { | 93 void AwMainDelegate::PreSandboxStartup() { |
88 // TODO(torne): When we have a separate renderer process, we need to handle | 94 // TODO(torne): When we have a separate renderer process, we need to handle |
89 // being passed open FDs for the resource paks here. | 95 // being passed open FDs for the resource paks here. |
90 } | 96 } |
91 | 97 |
92 void AwMainDelegate::SandboxInitialized(const std::string& process_type) { | 98 void AwMainDelegate::SandboxInitialized(const std::string& process_type) { |
93 // TODO(torne): Adjust linux OOM score here. | 99 // TODO(torne): Adjust linux OOM score here. |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( | 152 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( |
147 content::WebContents* web_contents) { | 153 content::WebContents* web_contents) { |
148 return AwWebContentsViewDelegate::Create(web_contents); | 154 return AwWebContentsViewDelegate::Create(web_contents); |
149 } | 155 } |
150 | 156 |
151 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { | 157 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { |
152 return new AwWebPreferencesPopulaterImpl(); | 158 return new AwWebPreferencesPopulaterImpl(); |
153 } | 159 } |
154 | 160 |
155 } // namespace android_webview | 161 } // namespace android_webview |
OLD | NEW |