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

Side by Side Diff: content/browser/renderer_host/image_transport_factory.cc

Issue 9904005: PpapiCommandBufferProxy implements CommandBufferProxy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed obsolete ENABLE_GPU def from CommandBufferProxy Created 8 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 | 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 "content/browser/renderer_host/image_transport_factory.h" 5 #include "content/browser/renderer_host/image_transport_factory.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "content/browser/gpu/gpu_surface_tracker.h" 14 #include "content/browser/gpu/gpu_surface_tracker.h"
15 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 15 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
16 #include "content/browser/renderer_host/image_transport_client.h" 16 #include "content/browser/renderer_host/image_transport_client.h"
17 #include "content/common/gpu/client/command_buffer_proxy.h"
18 #include "content/common/gpu/client/gpu_channel_host.h" 17 #include "content/common/gpu/client/gpu_channel_host.h"
19 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 18 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
20 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
20 #include "gpu/ipc/command_buffer_proxy.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
22 #include "ui/gfx/compositor/compositor.h" 22 #include "ui/gfx/compositor/compositor.h"
23 #include "ui/gfx/compositor/compositor_setup.h" 23 #include "ui/gfx/compositor/compositor_setup.h"
24 #include "ui/gfx/gl/gl_context.h" 24 #include "ui/gfx/gl/gl_context.h"
25 #include "ui/gfx/gl/gl_surface.h" 25 #include "ui/gfx/gl/gl_surface.h"
26 #include "ui/gfx/gl/scoped_make_current.h" 26 #include "ui/gfx/gl/scoped_make_current.h"
27 #include "ui/gfx/native_widget_types.h" 27 #include "ui/gfx/native_widget_types.h"
28 #include "ui/gfx/size.h" 28 #include "ui/gfx/size.h"
29 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" 29 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
30 30
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 void ImageTransportFactory::Terminate() { 442 void ImageTransportFactory::Terminate() {
443 ui::ContextFactory::SetInstance(NULL); 443 ui::ContextFactory::SetInstance(NULL);
444 delete g_factory; 444 delete g_factory;
445 g_factory = NULL; 445 g_factory = NULL;
446 } 446 }
447 447
448 // static 448 // static
449 ImageTransportFactory* ImageTransportFactory::GetInstance() { 449 ImageTransportFactory* ImageTransportFactory::GetInstance() {
450 return g_factory; 450 return g_factory;
451 } 451 }
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/client/command_buffer_proxy.h » ('j') | gpu/ipc/command_buffer_proxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698