| 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/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
| 14 #include "base/trace_event/trace_event_argument.h" | 14 #include "base/trace_event/trace_event_argument.h" |
| 15 #include "components/exo/notification_surface.h" |
| 16 #include "components/exo/notification_surface_manager.h" |
| 15 #include "components/exo/shared_memory.h" | 17 #include "components/exo/shared_memory.h" |
| 16 #include "components/exo/shell_surface.h" | 18 #include "components/exo/shell_surface.h" |
| 17 #include "components/exo/sub_surface.h" | 19 #include "components/exo/sub_surface.h" |
| 18 #include "components/exo/surface.h" | 20 #include "components/exo/surface.h" |
| 19 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 20 | 22 |
| 21 #if defined(USE_OZONE) | 23 #if defined(USE_OZONE) |
| 22 #include <GLES2/gl2extchromium.h> | 24 #include <GLES2/gl2extchromium.h> |
| 23 #include "components/exo/buffer.h" | 25 #include "components/exo/buffer.h" |
| 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 26 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| 25 #include "third_party/khronos/GLES2/gl2.h" | 27 #include "third_party/khronos/GLES2/gl2.h" |
| 26 #include "third_party/khronos/GLES2/gl2ext.h" | 28 #include "third_party/khronos/GLES2/gl2ext.h" |
| 27 #include "ui/aura/env.h" | 29 #include "ui/aura/env.h" |
| 28 #endif | 30 #endif |
| 29 | 31 |
| 30 namespace exo { | 32 namespace exo { |
| 31 | 33 |
| 32 //////////////////////////////////////////////////////////////////////////////// | 34 //////////////////////////////////////////////////////////////////////////////// |
| 33 // Display, public: | 35 // Display, public: |
| 34 | 36 |
| 35 Display::Display() {} | 37 Display::Display() : notification_surface_manager_(nullptr) {} |
| 38 |
| 39 Display::Display(NotificationSurfaceManager* notification_surface_manager) |
| 40 : notification_surface_manager_(notification_surface_manager) {} |
| 36 | 41 |
| 37 Display::~Display() {} | 42 Display::~Display() {} |
| 38 | 43 |
| 39 std::unique_ptr<Surface> Display::CreateSurface() { | 44 std::unique_ptr<Surface> Display::CreateSurface() { |
| 40 TRACE_EVENT0("exo", "Display::CreateSurface"); | 45 TRACE_EVENT0("exo", "Display::CreateSurface"); |
| 41 | 46 |
| 42 return base::WrapUnique(new Surface); | 47 return base::WrapUnique(new Surface); |
| 43 } | 48 } |
| 44 | 49 |
| 45 std::unique_ptr<SharedMemory> Display::CreateSharedMemory( | 50 std::unique_ptr<SharedMemory> Display::CreateSharedMemory( |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 } | 177 } |
| 173 | 178 |
| 174 if (surface->HasSurfaceDelegate()) { | 179 if (surface->HasSurfaceDelegate()) { |
| 175 DLOG(ERROR) << "Surface has already been assigned a role"; | 180 DLOG(ERROR) << "Surface has already been assigned a role"; |
| 176 return nullptr; | 181 return nullptr; |
| 177 } | 182 } |
| 178 | 183 |
| 179 return base::WrapUnique(new SubSurface(surface, parent)); | 184 return base::WrapUnique(new SubSurface(surface, parent)); |
| 180 } | 185 } |
| 181 | 186 |
| 187 std::unique_ptr<NotificationSurface> Display::CreateNotificationSurface( |
| 188 Surface* surface, |
| 189 const std::string& notification_id) { |
| 190 TRACE_EVENT2("exo", "Display::CreateNotificationSurface", "surface", |
| 191 surface->AsTracedValue(), "notification_id", notification_id); |
| 192 |
| 193 if (!notification_surface_manager_ || |
| 194 notification_surface_manager_->GetSurface(notification_id)) { |
| 195 DLOG(ERROR) << "Invalid notification id, id=" << notification_id; |
| 196 return nullptr; |
| 197 } |
| 198 |
| 199 return base::MakeUnique<NotificationSurface>(notification_surface_manager_, |
| 200 surface, notification_id); |
| 201 } |
| 202 |
| 182 } // namespace exo | 203 } // namespace exo |
| OLD | NEW |