| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "components/exo/display.h" | 5 #include "components/exo/display.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/common/wm/wm_shell_window_ids.h" | 10 #include "ash/common/wm/wm_shell_window_ids.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include <GLES2/gl2extchromium.h> | 22 #include <GLES2/gl2extchromium.h> |
| 23 #include "components/exo/buffer.h" | 23 #include "components/exo/buffer.h" |
| 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| 25 #include "third_party/khronos/GLES2/gl2.h" | 25 #include "third_party/khronos/GLES2/gl2.h" |
| 26 #include "third_party/khronos/GLES2/gl2ext.h" | 26 #include "third_party/khronos/GLES2/gl2ext.h" |
| 27 #include "ui/aura/env.h" | 27 #include "ui/aura/env.h" |
| 28 #endif | 28 #endif |
| 29 | 29 |
| 30 namespace exo { | 30 namespace exo { |
| 31 | 31 |
| 32 const char kUseExoSurfaceLayer[] = "use-exo-surface-layer"; | 32 const char kDisableExoSurfaceLayer[] = "disable-exo-surface-layer"; |
| 33 | 33 |
| 34 //////////////////////////////////////////////////////////////////////////////// | 34 //////////////////////////////////////////////////////////////////////////////// |
| 35 // Display, public: | 35 // Display, public: |
| 36 | 36 |
| 37 Display::Display() { | 37 Display::Display() { |
| 38 Surface::SetUseSurfaceLayer( | 38 Surface::SetUseSurfaceLayer( |
| 39 base::CommandLine::ForCurrentProcess()->HasSwitch(kUseExoSurfaceLayer)); | 39 !base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 40 kDisableExoSurfaceLayer)); |
| 40 } | 41 } |
| 41 | 42 |
| 42 Display::~Display() {} | 43 Display::~Display() {} |
| 43 | 44 |
| 44 std::unique_ptr<Surface> Display::CreateSurface() { | 45 std::unique_ptr<Surface> Display::CreateSurface() { |
| 45 TRACE_EVENT0("exo", "Display::CreateSurface"); | 46 TRACE_EVENT0("exo", "Display::CreateSurface"); |
| 46 | 47 |
| 47 return base::WrapUnique(new Surface); | 48 return base::WrapUnique(new Surface); |
| 48 } | 49 } |
| 49 | 50 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 | 166 |
| 166 if (surface->HasSurfaceDelegate()) { | 167 if (surface->HasSurfaceDelegate()) { |
| 167 DLOG(ERROR) << "Surface has already been assigned a role"; | 168 DLOG(ERROR) << "Surface has already been assigned a role"; |
| 168 return nullptr; | 169 return nullptr; |
| 169 } | 170 } |
| 170 | 171 |
| 171 return base::WrapUnique(new SubSurface(surface, parent)); | 172 return base::WrapUnique(new SubSurface(surface, parent)); |
| 172 } | 173 } |
| 173 | 174 |
| 174 } // namespace exo | 175 } // namespace exo |
| OLD | NEW |