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

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

Issue 19522006: GLInProcessContext: support async flushes and dedicated GPU thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 10 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
11 #include "android_webview/native/aw_geolocation_permission_context.h" 11 #include "android_webview/native/aw_geolocation_permission_context.h"
12 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 12 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
13 #include "android_webview/native/aw_web_contents_view_delegate.h" 13 #include "android_webview/native/aw_web_contents_view_delegate.h"
14 #include "android_webview/renderer/aw_content_renderer_client.h" 14 #include "android_webview/renderer/aw_content_renderer_client.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
20 #include "cc/base/switches.h" 20 #include "cc/base/switches.h"
21 #include "content/public/browser/browser_main_runner.h" 21 #include "content/public/browser/browser_main_runner.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "gpu/command_buffer/client/gl_in_process_context.h" 24 #include "gpu/command_buffer/client/gl_in_process_context.h"
25 #include "gpu/command_buffer/service/in_process_command_buffer.h"
25 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h" 26 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
26 27
27 namespace android_webview { 28 namespace android_webview {
28 29
29 namespace { 30 namespace {
30 31
31 // TODO(boliu): Remove this global Allow once the underlying issues are 32 // TODO(boliu): Remove this global Allow once the underlying issues are
32 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below. 33 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below.
33 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> > 34 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> >
34 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER; 35 g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
35 36
36 } 37 }
37 38
38 AwMainDelegate::AwMainDelegate() 39 AwMainDelegate::AwMainDelegate()
39 : gpu_memory_buffer_factory_(new GpuMemoryBufferFactoryImpl) { 40 : gpu_memory_buffer_factory_(new GpuMemoryBufferFactoryImpl) {
40 } 41 }
41 42
42 AwMainDelegate::~AwMainDelegate() { 43 AwMainDelegate::~AwMainDelegate() {
43 } 44 }
44 45
45 bool AwMainDelegate::BasicStartupComplete(int* exit_code) { 46 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
46 content::SetContentClient(&content_client_); 47 content::SetContentClient(&content_client_);
47 48
48 gpu::GLInProcessContext::EnableVirtualizedContext();
49 gpu::GLInProcessContext::SetGpuMemoryBufferFactory( 49 gpu::GLInProcessContext::SetGpuMemoryBufferFactory(
50 gpu_memory_buffer_factory_.get()); 50 gpu_memory_buffer_factory_.get());
51 gpu::InProcessCommandBuffer::EnableVirtualizedContext();
51 52
52 CommandLine* cl = CommandLine::ForCurrentProcess(); 53 CommandLine* cl = CommandLine::ForCurrentProcess();
53 cl->AppendSwitch(switches::kEnableBeginFrameScheduling); 54 cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
54 if (!cl->HasSwitch("disable-map-image")) 55 if (!cl->HasSwitch("disable-map-image"))
55 cl->AppendSwitch(cc::switches::kUseMapImage); 56 cl->AppendSwitch(cc::switches::kUseMapImage);
56 57
57 // WebView uses the Android system's scrollbars and overscroll glow. 58 // WebView uses the Android system's scrollbars and overscroll glow.
58 cl->AppendSwitch(switches::kHideScrollbars); 59 cl->AppendSwitch(switches::kHideScrollbars);
59 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); 60 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
60 61
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 AwBrowserContext* browser_context) { 120 AwBrowserContext* browser_context) {
120 return AwGeolocationPermissionContext::Create(browser_context); 121 return AwGeolocationPermissionContext::Create(browser_context);
121 } 122 }
122 123
123 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 124 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
124 content::WebContents* web_contents) { 125 content::WebContents* web_contents) {
125 return AwWebContentsViewDelegate::Create(web_contents); 126 return AwWebContentsViewDelegate::Create(web_contents);
126 } 127 }
127 128
128 } // namespace android_webview 129 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698