| OLD | NEW |
| 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" |
| 12 #include "ui/gl/gl_surface.h" | 13 #include "ui/gl/gl_surface.h" |
| 13 #include "ui/ozone/public/gl_ozone.h" | 14 #include "ui/ozone/public/gl_ozone.h" |
| 14 #include "ui/ozone/public/surface_factory_ozone.h" | 15 #include "ui/ozone/public/surface_factory_ozone.h" |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| 17 | 18 |
| 18 // Handles GL initialization and surface/context creation for X11. | 19 // Handles GL initialization and surface/context creation for X11. |
| 19 class X11SurfaceFactory : public SurfaceFactoryOzone { | 20 class X11SurfaceFactory : public SurfaceFactoryOzone { |
| 20 public: | 21 public: |
| 21 X11SurfaceFactory(); | 22 X11SurfaceFactory(); |
| 22 ~X11SurfaceFactory() override; | 23 ~X11SurfaceFactory() override; |
| 23 | 24 |
| 24 // SurfaceFactoryOzone: | 25 // SurfaceFactoryOzone: |
| 25 std::vector<gl::GLImplementation> GetAllowedGLImplementations() override; | 26 std::vector<gl::GLImplementation> GetAllowedGLImplementations() override; |
| 26 GLOzone* GetGLOzone(gl::GLImplementation implementation) override; | 27 GLOzone* GetGLOzone(gl::GLImplementation implementation) override; |
| 27 | 28 |
| 28 private: | 29 private: |
| 29 std::unique_ptr<GLOzone> glx_implementation_; | 30 std::unique_ptr<GLOzone> glx_implementation_; |
| 30 std::unique_ptr<GLOzone> egl_implementation_; | 31 std::unique_ptr<GLOzone> egl_implementation_; |
| 31 | 32 |
| 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 |
| 32 DISALLOW_COPY_AND_ASSIGN(X11SurfaceFactory); | 38 DISALLOW_COPY_AND_ASSIGN(X11SurfaceFactory); |
| 33 }; | 39 }; |
| 34 | 40 |
| 35 } // namespace ui | 41 } // namespace ui |
| 36 | 42 |
| 37 #endif // UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_ | 43 #endif // UI_OZONE_PLATFORM_X11_X11_SURFACE_FACTORY_H_ |
| OLD | NEW |