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

Side by Side Diff: content/browser/aura/gpu_process_transport_factory.h

Issue 111063003: Aura: Don't create GL context for CreateSharedSurfaceHandle() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try to make tests happy by still creating shared context Created 6 years, 11 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
« no previous file with comments | « no previous file | content/browser/aura/gpu_process_transport_factory.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
6 #define CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_ 6 #define CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/id_map.h" 10 #include "base/id_map.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 scoped_refptr<ui::Reflector> reflector) OVERRIDE; 44 scoped_refptr<ui::Reflector> reflector) OVERRIDE;
45 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; 45 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE;
46 virtual scoped_refptr<cc::ContextProvider> 46 virtual scoped_refptr<cc::ContextProvider>
47 OffscreenCompositorContextProvider() OVERRIDE; 47 OffscreenCompositorContextProvider() OVERRIDE;
48 virtual scoped_refptr<cc::ContextProvider> 48 virtual scoped_refptr<cc::ContextProvider>
49 SharedMainThreadContextProvider() OVERRIDE; 49 SharedMainThreadContextProvider() OVERRIDE;
50 virtual bool DoesCreateTestContexts() OVERRIDE; 50 virtual bool DoesCreateTestContexts() OVERRIDE;
51 51
52 // ImageTransportFactory implementation. 52 // ImageTransportFactory implementation.
53 virtual ui::ContextFactory* AsContextFactory() OVERRIDE; 53 virtual ui::ContextFactory* AsContextFactory() OVERRIDE;
54 virtual gfx::GLSurfaceHandle CreateSharedSurfaceHandle() OVERRIDE; 54 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() OVERRIDE;
55 virtual void DestroySharedSurfaceHandle(
56 gfx::GLSurfaceHandle surface) OVERRIDE;
57 virtual scoped_refptr<ui::Texture> CreateTransportClient( 55 virtual scoped_refptr<ui::Texture> CreateTransportClient(
58 float device_scale_factor) OVERRIDE; 56 float device_scale_factor) OVERRIDE;
59 virtual scoped_refptr<ui::Texture> CreateOwnedTexture( 57 virtual scoped_refptr<ui::Texture> CreateOwnedTexture(
60 const gfx::Size& size, 58 const gfx::Size& size,
61 float device_scale_factor, 59 float device_scale_factor,
62 unsigned int texture_id) OVERRIDE; 60 unsigned int texture_id) OVERRIDE;
63 virtual GLHelper* GetGLHelper() OVERRIDE; 61 virtual GLHelper* GetGLHelper() OVERRIDE;
64 virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE; 62 virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE;
65 virtual void RemoveObserver( 63 virtual void RemoveObserver(
66 ImageTransportFactoryObserver* observer) OVERRIDE; 64 ImageTransportFactoryObserver* observer) OVERRIDE;
(...skipping 21 matching lines...) Expand all
88 IDMap<BrowserCompositorOutputSurface> output_surface_map_; 86 IDMap<BrowserCompositorOutputSurface> output_surface_map_;
89 87
90 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; 88 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
91 89
92 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); 90 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
93 }; 91 };
94 92
95 } // namespace content 93 } // namespace content
96 94
97 #endif // CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_ 95 #endif // CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/aura/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698