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

Side by Side Diff: content/common/gpu/image_transport_surface_calayer_mac.h

Issue 630853003: Replace OVERRIDE and FINAL with override and final in content/common/[a-s]* (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_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_CALAYER_MAC_H_ 5 #ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_CALAYER_MAC_H_
6 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_CALAYER_MAC_H_ 6 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_CALAYER_MAC_H_
7 7
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "content/common/gpu/image_transport_surface_fbo_mac.h" 9 #include "content/common/gpu/image_transport_surface_fbo_mac.h"
10 #include "ui/base/cocoa/remote_layer_api.h" 10 #include "ui/base/cocoa/remote_layer_api.h"
11 #include "ui/gl/gl_bindings.h" 11 #include "ui/gl/gl_bindings.h"
12 #include "ui/gl/scoped_cgl.h" 12 #include "ui/gl/scoped_cgl.h"
13 13
14 @class ImageTransportLayer; 14 @class ImageTransportLayer;
15 15
16 namespace content { 16 namespace content {
17 17
18 // Allocate CAOpenGLLayer-backed storage for an FBO image transport surface. 18 // Allocate CAOpenGLLayer-backed storage for an FBO image transport surface.
19 class CALayerStorageProvider 19 class CALayerStorageProvider
20 : public ImageTransportSurfaceFBO::StorageProvider { 20 : public ImageTransportSurfaceFBO::StorageProvider {
21 public: 21 public:
22 CALayerStorageProvider(ImageTransportSurfaceFBO* transport_surface); 22 CALayerStorageProvider(ImageTransportSurfaceFBO* transport_surface);
23 virtual ~CALayerStorageProvider(); 23 virtual ~CALayerStorageProvider();
24 24
25 // ImageTransportSurfaceFBO::StorageProvider implementation: 25 // ImageTransportSurfaceFBO::StorageProvider implementation:
26 virtual gfx::Size GetRoundedSize(gfx::Size size) OVERRIDE; 26 virtual gfx::Size GetRoundedSize(gfx::Size size) override;
27 virtual bool AllocateColorBufferStorage( 27 virtual bool AllocateColorBufferStorage(
28 CGLContextObj context, GLuint texture, 28 CGLContextObj context, GLuint texture,
29 gfx::Size pixel_size, float scale_factor) OVERRIDE; 29 gfx::Size pixel_size, float scale_factor) override;
30 virtual void FreeColorBufferStorage() OVERRIDE; 30 virtual void FreeColorBufferStorage() override;
31 virtual void SwapBuffers(const gfx::Size& size, float scale_factor) OVERRIDE; 31 virtual void SwapBuffers(const gfx::Size& size, float scale_factor) override;
32 virtual void WillWriteToBackbuffer() OVERRIDE; 32 virtual void WillWriteToBackbuffer() override;
33 virtual void DiscardBackbuffer() OVERRIDE; 33 virtual void DiscardBackbuffer() override;
34 virtual void SwapBuffersAckedByBrowser() OVERRIDE; 34 virtual void SwapBuffersAckedByBrowser() override;
35 35
36 // Interface to ImageTransportLayer: 36 // Interface to ImageTransportLayer:
37 CGLContextObj LayerShareGroupContext(); 37 CGLContextObj LayerShareGroupContext();
38 bool LayerCanDraw(); 38 bool LayerCanDraw();
39 void LayerDoDraw(); 39 void LayerDoDraw();
40 void LayerResetStorageProvider(); 40 void LayerResetStorageProvider();
41 41
42 private: 42 private:
43 void DrawWithVsyncDisabled(); 43 void DrawWithVsyncDisabled();
44 void SendPendingSwapToBrowserAfterFrameDrawn(); 44 void SendPendingSwapToBrowserAfterFrameDrawn();
(...skipping 23 matching lines...) Expand all
68 base::scoped_nsobject<CAContext> context_; 68 base::scoped_nsobject<CAContext> context_;
69 base::scoped_nsobject<ImageTransportLayer> layer_; 69 base::scoped_nsobject<ImageTransportLayer> layer_;
70 70
71 base::WeakPtrFactory<CALayerStorageProvider> weak_factory_; 71 base::WeakPtrFactory<CALayerStorageProvider> weak_factory_;
72 DISALLOW_COPY_AND_ASSIGN(CALayerStorageProvider); 72 DISALLOW_COPY_AND_ASSIGN(CALayerStorageProvider);
73 }; 73 };
74 74
75 } // namespace content 75 } // namespace content
76 76
77 #endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_CALAYER_MAC_H_ 77 #endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_CALAYER_MAC_H_
OLDNEW
« no previous file with comments | « content/common/gpu/image_transport_surface_android.cc ('k') | content/common/gpu/image_transport_surface_fbo_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698