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

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

Issue 180723023: gpu: Mailbox emulation with EGLImage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops Created 6 years, 9 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/gpu_memory_buffer_factory_impl.h" 8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
9 #include "android_webview/browser/hardware_renderer.h" 9 #include "android_webview/browser/hardware_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 "gpu/command_buffer/service/mailbox_synchronizer.h"
29 #include "media/base/media_switches.h" 30 #include "media/base/media_switches.h"
30 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h" 31 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
31 32
32 namespace android_webview { 33 namespace android_webview {
33 34
34 namespace { 35 namespace {
35 36
36 // TODO(boliu): Remove this global Allow once the underlying issues are 37 // TODO(boliu): Remove this global Allow once the underlying issues are
37 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. 38 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below.
38 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > 39 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> >
(...skipping 21 matching lines...) Expand all
60 cl->AppendSwitch(cc::switches::kEnableMapImage); 61 cl->AppendSwitch(cc::switches::kEnableMapImage);
61 62
62 // WebView uses the Android system's scrollbars and overscroll glow. 63 // WebView uses the Android system's scrollbars and overscroll glow.
63 cl->AppendSwitch(switches::kHideScrollbars); 64 cl->AppendSwitch(switches::kHideScrollbars);
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::kDisableExperimentalWebGL); 68 cl->AppendSwitch(switches::kDisableExperimentalWebGL);
68 cl->AppendSwitch(switches::kDisableSharedWorkers); 69 cl->AppendSwitch(switches::kDisableSharedWorkers);
69 70
70 // Ganesh backed 2D-Canvas integration is being implemented but not ready to 71 if (!gpu::gles2::MailboxSynchronizer::Initialize())
71 // be turned on by default yet.
72 if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas))
73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas); 72 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
74 73
75 // File system API not supported (requires some new API; internal bug 6930981) 74 // File system API not supported (requires some new API; internal bug 6930981)
76 cl->AppendSwitch(switches::kDisableFileSystem); 75 cl->AppendSwitch(switches::kDisableFileSystem);
77 76
78 // Disable compositor touch hit testing for now to mitigate risk of bugs. 77 // Disable compositor touch hit testing for now to mitigate risk of bugs.
79 cl->AppendSwitch(cc::switches::kDisableCompositorTouchHitTesting); 78 cl->AppendSwitch(cc::switches::kDisableCompositorTouchHitTesting);
80 79
81 #if defined(VIDEO_HOLE) 80 #if defined(VIDEO_HOLE)
82 // Support EME/L1 with hole-punching. 81 // Support EME/L1 with hole-punching.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 146 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
148 content::WebContents* web_contents) { 147 content::WebContents* web_contents) {
149 return AwWebContentsViewDelegate::Create(web_contents); 148 return AwWebContentsViewDelegate::Create(web_contents);
150 } 149 }
151 150
152 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { 151 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
153 return new AwWebPreferencesPopulaterImpl(); 152 return new AwWebPreferencesPopulaterImpl();
154 } 153 }
155 154
156 } // namespace android_webview 155 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698