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

Side by Side Diff: ui/ozone/platform/wayland/wayland_egl_surface.h

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_WAYLAND_WAYLAND_EGL_SURFACE_H_ 5 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_EGL_SURFACE_H_
6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_EGL_SURFACE_H_ 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_EGL_SURFACE_H_
7 7
8 #include <memory>
9
8 #include "ui/gfx/geometry/size.h" 10 #include "ui/gfx/geometry/size.h"
9 #include "ui/gfx/vsync_provider.h" 11 #include "ui/gfx/vsync_provider.h"
10 #include "ui/ozone/public/surface_ozone_egl.h" 12 #include "ui/ozone/public/surface_ozone_egl.h"
11 13
12 struct wl_egl_window; 14 struct wl_egl_window;
13 15
14 namespace ui { 16 namespace ui {
15 17
16 class WaylandWindow; 18 class WaylandWindow;
17 19
18 struct EGLWindowDeleter { 20 struct EGLWindowDeleter {
19 void operator()(wl_egl_window* egl_window); 21 void operator()(wl_egl_window* egl_window);
20 }; 22 };
21 23
22 class WaylandEGLSurface : public SurfaceOzoneEGL { 24 class WaylandEGLSurface : public SurfaceOzoneEGL {
23 public: 25 public:
24 WaylandEGLSurface(WaylandWindow* window, const gfx::Size& size); 26 WaylandEGLSurface(WaylandWindow* window, const gfx::Size& size);
25 ~WaylandEGLSurface() override; 27 ~WaylandEGLSurface() override;
26 28
27 bool Initialize(); 29 bool Initialize();
28 30
29 // SurfaceOzoneEGL 31 // SurfaceOzoneEGL
30 intptr_t GetNativeWindow() override; 32 intptr_t GetNativeWindow() override;
31 bool ResizeNativeWindow(const gfx::Size& viewport_size) override; 33 bool ResizeNativeWindow(const gfx::Size& viewport_size) override;
32 bool OnSwapBuffers() override; 34 bool OnSwapBuffers() override;
33 void OnSwapBuffersAsync(const SwapCompletionCallback& callback) override; 35 void OnSwapBuffersAsync(const SwapCompletionCallback& callback) override;
34 scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override; 36 std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
35 void* /* EGLConfig */ GetEGLSurfaceConfig( 37 void* /* EGLConfig */ GetEGLSurfaceConfig(
36 const EglConfigCallbacks& egl) override; 38 const EglConfigCallbacks& egl) override;
37 39
38 private: 40 private:
39 WaylandWindow* window_; 41 WaylandWindow* window_;
40 42
41 gfx::Size size_; 43 gfx::Size size_;
42 scoped_ptr<wl_egl_window, EGLWindowDeleter> egl_window_; 44 std::unique_ptr<wl_egl_window, EGLWindowDeleter> egl_window_;
43 45
44 DISALLOW_COPY_AND_ASSIGN(WaylandEGLSurface); 46 DISALLOW_COPY_AND_ASSIGN(WaylandEGLSurface);
45 }; 47 };
46 48
47 } // namespace ui 49 } // namespace ui
48 50
49 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_EGL_SURFACE_H_ 51 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_EGL_SURFACE_H_
OLDNEW
« no previous file with comments | « ui/message_center/cocoa/popup_collection.h ('k') | ui/ozone/platform/wayland/wayland_egl_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698