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

Side by Side Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 890873007: Cleanup: Move ContextProviderWebContext into cc/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 "content/renderer/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/shared_memory.h" 11 #include "base/memory/shared_memory.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/numerics/safe_conversions.h" 14 #include "base/numerics/safe_conversions.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "cc/blink/context_provider_web_context.h"
17 #include "content/child/database_util.h" 18 #include "content/child/database_util.h"
18 #include "content/child/file_info_util.h" 19 #include "content/child/file_info_util.h"
19 #include "content/child/fileapi/webfilesystem_impl.h" 20 #include "content/child/fileapi/webfilesystem_impl.h"
20 #include "content/child/indexed_db/webidbfactory_impl.h" 21 #include "content/child/indexed_db/webidbfactory_impl.h"
21 #include "content/child/npapi/npobject_util.h" 22 #include "content/child/npapi/npobject_util.h"
22 #include "content/child/quota_dispatcher.h" 23 #include "content/child/quota_dispatcher.h"
23 #include "content/child/quota_message_filter.h" 24 #include "content/child/quota_message_filter.h"
24 #include "content/child/simple_webmimeregistry_impl.h" 25 #include "content/child/simple_webmimeregistry_impl.h"
25 #include "content/child/thread_safe_sender.h" 26 #include "content/child/thread_safe_sender.h"
26 #include "content/child/web_database_observer_impl.h" 27 #include "content/child/web_database_observer_impl.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "third_party/WebKit/public/platform/WebDeviceOrientationListener.h" 73 #include "third_party/WebKit/public/platform/WebDeviceOrientationListener.h"
73 #include "third_party/WebKit/public/platform/WebFileInfo.h" 74 #include "third_party/WebKit/public/platform/WebFileInfo.h"
74 #include "third_party/WebKit/public/platform/WebGamepads.h" 75 #include "third_party/WebKit/public/platform/WebGamepads.h"
75 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" 76 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
76 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" 77 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"
77 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h" 78 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h"
78 #include "third_party/WebKit/public/platform/WebURL.h" 79 #include "third_party/WebKit/public/platform/WebURL.h"
79 #include "third_party/WebKit/public/platform/WebVector.h" 80 #include "third_party/WebKit/public/platform/WebVector.h"
80 #include "ui/gfx/color_profile.h" 81 #include "ui/gfx/color_profile.h"
81 #include "url/gurl.h" 82 #include "url/gurl.h"
82 #include "webkit/common/gpu/context_provider_web_context.h"
83 83
84 #if defined(OS_ANDROID) 84 #if defined(OS_ANDROID)
85 #include "content/renderer/android/synchronous_compositor_factory.h" 85 #include "content/renderer/android/synchronous_compositor_factory.h"
86 #include "content/renderer/media/android/audio_decoder_android.h" 86 #include "content/renderer/media/android/audio_decoder_android.h"
87 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" 87 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
88 #endif 88 #endif
89 89
90 #if defined(OS_MACOSX) 90 #if defined(OS_MACOSX)
91 #include "content/common/mac/font_descriptor.h" 91 #include "content/common/mac/font_descriptor.h"
92 #include "content/common/mac/font_loader.h" 92 #include "content/common/mac/font_loader.h"
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 // failed. Need to try to restore the context again later. 1002 // failed. Need to try to restore the context again later.
1003 if (!context || !context->InitializeOnCurrentThread()) 1003 if (!context || !context->InitializeOnCurrentThread())
1004 return NULL; 1004 return NULL;
1005 return context.release(); 1005 return context.release();
1006 } 1006 }
1007 1007
1008 //------------------------------------------------------------------------------ 1008 //------------------------------------------------------------------------------
1009 1009
1010 blink::WebGraphicsContext3DProvider* 1010 blink::WebGraphicsContext3DProvider*
1011 RendererBlinkPlatformImpl::createSharedOffscreenGraphicsContext3DProvider() { 1011 RendererBlinkPlatformImpl::createSharedOffscreenGraphicsContext3DProvider() {
1012 scoped_refptr<webkit::gpu::ContextProviderWebContext> provider = 1012 scoped_refptr<cc_blink::ContextProviderWebContext> provider =
1013 RenderThreadImpl::current()->SharedMainThreadContextProvider(); 1013 RenderThreadImpl::current()->SharedMainThreadContextProvider();
1014 if (!provider.get()) 1014 if (!provider.get())
1015 return NULL; 1015 return NULL;
1016 return new WebGraphicsContext3DProviderImpl(provider); 1016 return new WebGraphicsContext3DProviderImpl(provider);
1017 } 1017 }
1018 1018
1019 //------------------------------------------------------------------------------ 1019 //------------------------------------------------------------------------------
1020 1020
1021 blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() { 1021 blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() {
1022 return &compositor_support_; 1022 return &compositor_support_;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 //------------------------------------------------------------------------------ 1224 //------------------------------------------------------------------------------
1225 1225
1226 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1226 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1227 const blink::WebBatteryStatus& status) { 1227 const blink::WebBatteryStatus& status) {
1228 if (!g_test_battery_status_listener) 1228 if (!g_test_battery_status_listener)
1229 return; 1229 return;
1230 g_test_battery_status_listener->updateBatteryStatus(status); 1230 g_test_battery_status_listener->updateBatteryStatus(status);
1231 } 1231 }
1232 1232
1233 } // namespace content 1233 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/webgraphicscontext3d_provider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698