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

Side by Side Diff: content/renderer/render_thread_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
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 return make_scoped_ptr( 1266 return make_scoped_ptr(
1267 WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( 1267 WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
1268 gpu_channel_host.get(), 1268 gpu_channel_host.get(),
1269 attributes, 1269 attributes,
1270 lose_context_when_out_of_memory, 1270 lose_context_when_out_of_memory,
1271 GURL("chrome://gpu/RenderThreadImpl::CreateOffscreenContext3d"), 1271 GURL("chrome://gpu/RenderThreadImpl::CreateOffscreenContext3d"),
1272 WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(), 1272 WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
1273 NULL)); 1273 NULL));
1274 } 1274 }
1275 1275
1276 scoped_refptr<webkit::gpu::ContextProviderWebContext> 1276 scoped_refptr<cc_blink::ContextProviderWebContext>
1277 RenderThreadImpl::SharedMainThreadContextProvider() { 1277 RenderThreadImpl::SharedMainThreadContextProvider() {
1278 DCHECK(IsMainThread()); 1278 DCHECK(IsMainThread());
1279 if (!shared_main_thread_contexts_.get() || 1279 if (!shared_main_thread_contexts_.get() ||
1280 shared_main_thread_contexts_->DestroyedOnMainThread()) { 1280 shared_main_thread_contexts_->DestroyedOnMainThread()) {
1281 shared_main_thread_contexts_ = NULL; 1281 shared_main_thread_contexts_ = NULL;
1282 #if defined(OS_ANDROID) 1282 #if defined(OS_ANDROID)
1283 if (SynchronousCompositorFactory* factory = 1283 if (SynchronousCompositorFactory* factory =
1284 SynchronousCompositorFactory::GetInstance()) { 1284 SynchronousCompositorFactory::GetInstance()) {
1285 shared_main_thread_contexts_ = factory->CreateOffscreenContextProvider( 1285 shared_main_thread_contexts_ = factory->CreateOffscreenContextProvider(
1286 GetOffscreenAttribs(), "Offscreen-MainThread"); 1286 GetOffscreenAttribs(), "Offscreen-MainThread");
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 mojo::InterfaceRequest<mojo::ServiceProvider> services, 1809 mojo::InterfaceRequest<mojo::ServiceProvider> services,
1810 mojo::ServiceProviderPtr exposed_services) 1810 mojo::ServiceProviderPtr exposed_services)
1811 : services(services.Pass()), 1811 : services(services.Pass()),
1812 exposed_services(exposed_services.Pass()) { 1812 exposed_services(exposed_services.Pass()) {
1813 } 1813 }
1814 1814
1815 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { 1815 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() {
1816 } 1816 }
1817 1817
1818 } // namespace content 1818 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698