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

Side by Side Diff: ui/gl/gl_context_cgl.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
« no previous file with comments | « ui/android/window_android_compositor.h ('k') | ui/message_center/cocoa/popup_collection.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GL_GL_CONTEXT_CGL_H_ 5 #ifndef UI_GL_GL_CONTEXT_CGL_H_
6 #define UI_GL_GL_CONTEXT_CGL_H_ 6 #define UI_GL_GL_CONTEXT_CGL_H_
7 7
8 #include <OpenGL/CGLTypes.h> 8 #include <OpenGL/CGLTypes.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "ui/gl/gl_context.h" 13 #include "ui/gl/gl_context.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 16
16 class GLSurface; 17 class GLSurface;
17 18
18 // Encapsulates a CGL OpenGL context. 19 // Encapsulates a CGL OpenGL context.
19 class GLContextCGL : public GLContextReal { 20 class GLContextCGL : public GLContextReal {
20 public: 21 public:
21 explicit GLContextCGL(GLShareGroup* share_group); 22 explicit GLContextCGL(GLShareGroup* share_group);
(...skipping 12 matching lines...) Expand all
34 35
35 protected: 36 protected:
36 ~GLContextCGL() override; 37 ~GLContextCGL() override;
37 38
38 private: 39 private:
39 void Destroy(); 40 void Destroy();
40 GpuPreference GetGpuPreference(); 41 GpuPreference GetGpuPreference();
41 42
42 void* context_; 43 void* context_;
43 GpuPreference gpu_preference_; 44 GpuPreference gpu_preference_;
44 scoped_ptr<gl::YUVToRGBConverter> yuv_to_rgb_converter_; 45 std::unique_ptr<gl::YUVToRGBConverter> yuv_to_rgb_converter_;
45 46
46 CGLPixelFormatObj discrete_pixelformat_; 47 CGLPixelFormatObj discrete_pixelformat_;
47 48
48 int screen_; 49 int screen_;
49 int renderer_id_; 50 int renderer_id_;
50 bool safe_to_force_gpu_switch_; 51 bool safe_to_force_gpu_switch_;
51 52
52 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); 53 DISALLOW_COPY_AND_ASSIGN(GLContextCGL);
53 }; 54 };
54 55
55 } // namespace gfx 56 } // namespace gfx
56 57
57 #endif // UI_GL_GL_CONTEXT_CGL_H_ 58 #endif // UI_GL_GL_CONTEXT_CGL_H_
OLDNEW
« no previous file with comments | « ui/android/window_android_compositor.h ('k') | ui/message_center/cocoa/popup_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698