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

Side by Side Diff: ui/ozone/platform/dri/gbm_surface.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « ui/ozone/platform/dri/gbm_buffer_base.h ('k') | ui/ozone/platform/dri/gbm_surface_factory.h » ('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 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 UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_ 5 #ifndef UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
6 #define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_ 6 #define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/gfx/geometry/size.h" 9 #include "ui/gfx/geometry/size.h"
10 #include "ui/ozone/platform/dri/gbm_surfaceless.h" 10 #include "ui/ozone/platform/dri/gbm_surfaceless.h"
(...skipping 16 matching lines...) Expand all
27 class GbmSurface : public GbmSurfaceless { 27 class GbmSurface : public GbmSurfaceless {
28 public: 28 public:
29 GbmSurface(DriWindowDelegate* window_delegate, 29 GbmSurface(DriWindowDelegate* window_delegate,
30 gbm_device* device, 30 gbm_device* device,
31 DriWrapper* dri); 31 DriWrapper* dri);
32 virtual ~GbmSurface(); 32 virtual ~GbmSurface();
33 33
34 bool Initialize(); 34 bool Initialize();
35 35
36 // GbmSurfaceless: 36 // GbmSurfaceless:
37 virtual intptr_t GetNativeWindow() OVERRIDE; 37 virtual intptr_t GetNativeWindow() override;
38 virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE; 38 virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) override;
39 virtual bool OnSwapBuffers() OVERRIDE; 39 virtual bool OnSwapBuffers() override;
40 40
41 private: 41 private:
42 gbm_device* gbm_device_; 42 gbm_device* gbm_device_;
43 43
44 DriWrapper* dri_; 44 DriWrapper* dri_;
45 45
46 // The native GBM surface. In EGL this represents the EGLNativeWindowType. 46 // The native GBM surface. In EGL this represents the EGLNativeWindowType.
47 gbm_surface* native_surface_; 47 gbm_surface* native_surface_;
48 48
49 // Buffer currently used for scanout. 49 // Buffer currently used for scanout.
50 gbm_bo* current_buffer_; 50 gbm_bo* current_buffer_;
51 51
52 gfx::Size size_; 52 gfx::Size size_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(GbmSurface); 54 DISALLOW_COPY_AND_ASSIGN(GbmSurface);
55 }; 55 };
56 56
57 } // namespace ui 57 } // namespace ui
58 58
59 #endif // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_ 59 #endif // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/gbm_buffer_base.h ('k') | ui/ozone/platform/dri/gbm_surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698