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

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

Issue 634703003: Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_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 26 matching lines...) Expand all
37 public: 37 public:
38 GpuProcessTransportFactory(); 38 GpuProcessTransportFactory();
39 39
40 virtual ~GpuProcessTransportFactory(); 40 virtual ~GpuProcessTransportFactory();
41 41
42 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> 42 scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
43 CreateOffscreenCommandBufferContext(); 43 CreateOffscreenCommandBufferContext();
44 44
45 // ui::ContextFactory implementation. 45 // ui::ContextFactory implementation.
46 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface( 46 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
47 ui::Compositor* compositor, bool software_fallback) OVERRIDE; 47 ui::Compositor* compositor, bool software_fallback) override;
48 virtual scoped_refptr<ui::Reflector> CreateReflector( 48 virtual scoped_refptr<ui::Reflector> CreateReflector(
49 ui::Compositor* source, 49 ui::Compositor* source,
50 ui::Layer* target) OVERRIDE; 50 ui::Layer* target) override;
51 virtual void RemoveReflector( 51 virtual void RemoveReflector(
52 scoped_refptr<ui::Reflector> reflector) OVERRIDE; 52 scoped_refptr<ui::Reflector> reflector) override;
53 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; 53 virtual void RemoveCompositor(ui::Compositor* compositor) override;
54 virtual scoped_refptr<cc::ContextProvider> 54 virtual scoped_refptr<cc::ContextProvider>
55 SharedMainThreadContextProvider() OVERRIDE; 55 SharedMainThreadContextProvider() override;
56 virtual bool DoesCreateTestContexts() OVERRIDE; 56 virtual bool DoesCreateTestContexts() override;
57 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; 57 virtual cc::SharedBitmapManager* GetSharedBitmapManager() override;
58 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; 58 virtual base::MessageLoopProxy* GetCompositorMessageLoop() override;
59 59
60 // ImageTransportFactory implementation. 60 // ImageTransportFactory implementation.
61 virtual ui::ContextFactory* GetContextFactory() OVERRIDE; 61 virtual ui::ContextFactory* GetContextFactory() override;
62 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() OVERRIDE; 62 virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
63 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() 63 virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator()
64 OVERRIDE; 64 override;
65 virtual cc::SurfaceManager* GetSurfaceManager() OVERRIDE; 65 virtual cc::SurfaceManager* GetSurfaceManager() override;
66 virtual GLHelper* GetGLHelper() OVERRIDE; 66 virtual GLHelper* GetGLHelper() override;
67 virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE; 67 virtual void AddObserver(ImageTransportFactoryObserver* observer) override;
68 virtual void RemoveObserver( 68 virtual void RemoveObserver(
69 ImageTransportFactoryObserver* observer) OVERRIDE; 69 ImageTransportFactoryObserver* observer) override;
70 #if defined(OS_MACOSX) 70 #if defined(OS_MACOSX)
71 virtual void OnSurfaceDisplayed(int surface_id) OVERRIDE; 71 virtual void OnSurfaceDisplayed(int surface_id) override;
72 #endif 72 #endif
73 73
74 private: 74 private:
75 struct PerCompositorData; 75 struct PerCompositorData;
76 76
77 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); 77 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
78 scoped_ptr<WebGraphicsContext3DCommandBufferImpl> 78 scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
79 CreateContextCommon(int surface_id); 79 CreateContextCommon(int surface_id);
80 80
81 void OnLostMainThreadSharedContextInsideCallback(); 81 void OnLostMainThreadSharedContextInsideCallback();
(...skipping 15 matching lines...) Expand all
97 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; 97 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
98 98
99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; 99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); 101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
102 }; 102 };
103 103
104 } // namespace content 104 } // namespace content
105 105
106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698