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

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

Issue 1908223002: Remove content/gpu from content/browser/android/DEPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owned_sync_point_manager_ Created 4 years, 8 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
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"
11 #include "android_webview/browser/deferred_gpu_command_service.h"
11 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 12 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
12 #include "android_webview/common/aw_descriptors.h" 13 #include "android_webview/common/aw_descriptors.h"
13 #include "android_webview/common/aw_switches.h" 14 #include "android_webview/common/aw_switches.h"
14 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h" 15 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
16 #include "android_webview/gpu/aw_content_gpu_client.h"
15 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 17 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
16 #include "android_webview/native/aw_locale_manager_impl.h" 18 #include "android_webview/native/aw_locale_manager_impl.h"
17 #include "android_webview/native/aw_media_url_interceptor.h" 19 #include "android_webview/native/aw_media_url_interceptor.h"
18 #include "android_webview/native/aw_message_port_service_impl.h" 20 #include "android_webview/native/aw_message_port_service_impl.h"
19 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 21 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
20 #include "android_webview/native/aw_web_contents_view_delegate.h" 22 #include "android_webview/native/aw_web_contents_view_delegate.h"
21 #include "android_webview/native/aw_web_preferences_populater_impl.h" 23 #include "android_webview/native/aw_web_preferences_populater_impl.h"
22 #include "android_webview/renderer/aw_content_renderer_client.h" 24 #include "android_webview/renderer/aw_content_renderer_client.h"
23 #include "base/android/apk_assets.h" 25 #include "base/android/apk_assets.h"
24 #include "base/command_line.h" 26 #include "base/command_line.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 216
215 logging::CloseLogFile(); 217 logging::CloseLogFile();
216 } 218 }
217 219
218 content::ContentBrowserClient* 220 content::ContentBrowserClient*
219 AwMainDelegate::CreateContentBrowserClient() { 221 AwMainDelegate::CreateContentBrowserClient() {
220 content_browser_client_.reset(new AwContentBrowserClient(this)); 222 content_browser_client_.reset(new AwContentBrowserClient(this));
221 return content_browser_client_.get(); 223 return content_browser_client_.get();
222 } 224 }
223 225
226 namespace {
227 gpu::SyncPointManager* GetSyncPointManager() {
228 DCHECK(DeferredGpuCommandService::GetInstance());
229 return DeferredGpuCommandService::GetInstance()->sync_point_manager();
230 }
231 } // namespace
232
233 content::ContentGpuClient* AwMainDelegate::CreateContentGpuClient() {
234 content_gpu_client_.reset(
235 new AwContentGpuClient(base::Bind(&GetSyncPointManager)));
236 return content_gpu_client_.get();
237 }
238
224 content::ContentRendererClient* 239 content::ContentRendererClient*
225 AwMainDelegate::CreateContentRendererClient() { 240 AwMainDelegate::CreateContentRendererClient() {
226 content_renderer_client_.reset(new AwContentRendererClient()); 241 content_renderer_client_.reset(new AwContentRendererClient());
227 return content_renderer_client_.get(); 242 return content_renderer_client_.get();
228 } 243 }
229 244
230 scoped_refptr<AwQuotaManagerBridge> AwMainDelegate::CreateAwQuotaManagerBridge( 245 scoped_refptr<AwQuotaManagerBridge> AwMainDelegate::CreateAwQuotaManagerBridge(
231 AwBrowserContext* browser_context) { 246 AwBrowserContext* browser_context) {
232 return AwQuotaManagerBridgeImpl::Create(browser_context); 247 return AwQuotaManagerBridgeImpl::Create(browser_context);
233 } 248 }
(...skipping 18 matching lines...) Expand all
252 #if defined(VIDEO_HOLE) 267 #if defined(VIDEO_HOLE)
253 content::ExternalVideoSurfaceContainer* 268 content::ExternalVideoSurfaceContainer*
254 AwMainDelegate::CreateExternalVideoSurfaceContainer( 269 AwMainDelegate::CreateExternalVideoSurfaceContainer(
255 content::WebContents* web_contents) { 270 content::WebContents* web_contents) {
256 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( 271 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
257 web_contents); 272 web_contents);
258 } 273 }
259 #endif 274 #endif
260 275
261 } // namespace android_webview 276 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.h ('k') | android_webview/native/aw_autofill_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698