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

Side by Side Diff: ui/ozone/platform/x11/x11_surface_factory.h

Issue 2409263002: Revert of Add ThreadChecker for Ozone X11 GPU. (Closed)
Patch Set: Created 4 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 | « no previous file | ui/ozone/platform/x11/x11_surface_factory.cc » ('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 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_X11_X11_SURFACE_FACTORY_H_ 5 #ifndef UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_
6 #define UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_ 6 #define UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/threading/thread_checker.h"
13 #include "ui/gl/gl_surface.h" 12 #include "ui/gl/gl_surface.h"
14 #include "ui/ozone/public/gl_ozone.h" 13 #include "ui/ozone/public/gl_ozone.h"
15 #include "ui/ozone/public/surface_factory_ozone.h" 14 #include "ui/ozone/public/surface_factory_ozone.h"
16 15
17 namespace ui { 16 namespace ui {
18 17
19 // Handles GL initialization and surface/context creation for X11. 18 // Handles GL initialization and surface/context creation for X11.
20 class X11SurfaceFactory : public SurfaceFactoryOzone { 19 class X11SurfaceFactory : public SurfaceFactoryOzone {
21 public: 20 public:
22 X11SurfaceFactory(); 21 X11SurfaceFactory();
23 ~X11SurfaceFactory() override; 22 ~X11SurfaceFactory() override;
24 23
25 // SurfaceFactoryOzone: 24 // SurfaceFactoryOzone:
26 std::vector<gl::GLImplementation> GetAllowedGLImplementations() override; 25 std::vector<gl::GLImplementation> GetAllowedGLImplementations() override;
27 GLOzone* GetGLOzone(gl::GLImplementation implementation) override; 26 GLOzone* GetGLOzone(gl::GLImplementation implementation) override;
28 27
29 private: 28 private:
30 std::unique_ptr<GLOzone> glx_implementation_; 29 std::unique_ptr<GLOzone> glx_implementation_;
31 std::unique_ptr<GLOzone> egl_implementation_; 30 std::unique_ptr<GLOzone> egl_implementation_;
32 31
33 // X11 doesn't care if things being called from different threads if
34 // XInitThreads() was called. However, GBM does care. This will ensure X11
35 // and GBM behave roughly the same.
36 base::ThreadChecker thread_checker_;
37
38 DISALLOW_COPY_AND_ASSIGN(X11SurfaceFactory); 32 DISALLOW_COPY_AND_ASSIGN(X11SurfaceFactory);
39 }; 33 };
40 34
41 } // namespace ui 35 } // namespace ui
42 36
43 #endif // UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_ 37 #endif // UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | ui/ozone/platform/x11/x11_surface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698