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

Side by Side Diff: components/exo/display.cc

Issue 2008153002: Add initial implementation of cc::Surfaces backend for exo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « components/exo/BUILD.gn ('k') | components/exo/shell_surface_unittest.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 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/wm/common/wm_shell_window_ids.h" 10 #include "ash/wm/common/wm_shell_window_ids.h"
11 #include "base/command_line.h"
11 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
12 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
13 #include "base/trace_event/trace_event_argument.h" 14 #include "base/trace_event/trace_event_argument.h"
14 #include "components/exo/shared_memory.h" 15 #include "components/exo/shared_memory.h"
15 #include "components/exo/shell_surface.h" 16 #include "components/exo/shell_surface.h"
16 #include "components/exo/sub_surface.h" 17 #include "components/exo/sub_surface.h"
17 #include "components/exo/surface.h" 18 #include "components/exo/surface.h"
18 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
19 20
20 #if defined(USE_OZONE) 21 #if defined(USE_OZONE)
21 #include <GLES2/gl2extchromium.h> 22 #include <GLES2/gl2extchromium.h>
22 #include "components/exo/buffer.h" 23 #include "components/exo/buffer.h"
23 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
24 #include "third_party/khronos/GLES2/gl2.h" 25 #include "third_party/khronos/GLES2/gl2.h"
25 #include "third_party/khronos/GLES2/gl2ext.h" 26 #include "third_party/khronos/GLES2/gl2ext.h"
26 #include "ui/aura/env.h" 27 #include "ui/aura/env.h"
27 #endif 28 #endif
28 29
29 namespace exo { 30 namespace exo {
30 31
32 const char kUseExoSurfaceLayer[] = "use-exo-surface-layer";
33
31 //////////////////////////////////////////////////////////////////////////////// 34 ////////////////////////////////////////////////////////////////////////////////
32 // Display, public: 35 // Display, public:
33 36
34 Display::Display() {} 37 Display::Display() {
38 Surface::SetUseSurfaceLayer(
39 base::CommandLine::ForCurrentProcess()->HasSwitch(kUseExoSurfaceLayer));
40 }
35 41
36 Display::~Display() {} 42 Display::~Display() {}
37 43
38 std::unique_ptr<Surface> Display::CreateSurface() { 44 std::unique_ptr<Surface> Display::CreateSurface() {
39 TRACE_EVENT0("exo", "Display::CreateSurface"); 45 TRACE_EVENT0("exo", "Display::CreateSurface");
40 46
41 return base::WrapUnique(new Surface); 47 return base::WrapUnique(new Surface);
42 } 48 }
43 49
44 std::unique_ptr<SharedMemory> Display::CreateSharedMemory( 50 std::unique_ptr<SharedMemory> Display::CreateSharedMemory(
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 165
160 if (surface->HasSurfaceDelegate()) { 166 if (surface->HasSurfaceDelegate()) {
161 DLOG(ERROR) << "Surface has already been assigned a role"; 167 DLOG(ERROR) << "Surface has already been assigned a role";
162 return nullptr; 168 return nullptr;
163 } 169 }
164 170
165 return base::WrapUnique(new SubSurface(surface, parent)); 171 return base::WrapUnique(new SubSurface(surface, parent));
166 } 172 }
167 173
168 } // namespace exo 174 } // namespace exo
OLDNEW
« no previous file with comments | « components/exo/BUILD.gn ('k') | components/exo/shell_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698